[gnue] r7264 - in trunk: gnue-appserver gnue-common gnue-common/src/setup gnue-designer gnue-forms gnue-navigator gnue-reports

[reinhard]

Author: reinhard
Date: 2005-03-26 13:19:57 -0600 (Sat, 26 Mar 2005)
New Revision: 7264

Modified:
   trunk/gnue-appserver/setup.py
   trunk/gnue-common/setup.py
   trunk/gnue-common/src/setup/GSetup.py
   trunk/gnue-designer/setup.py
   trunk/gnue-forms/setup.py
   trunk/gnue-navigator/setup.py
   trunk/gnue-reports/setup.py
Log:
Fixed installing from SVN regarding gmo file installation.


Modified: trunk/gnue-appserver/setup.py
===================================================================
--- trunk/gnue-appserver/setup.py       2005-03-26 19:16:34 UTC (rev 7263)
+++ trunk/gnue-appserver/setup.py       2005-03-26 19:19:57 UTC (rev 7264)
@@ -38,8 +38,6 @@
 
 class setup (GSetup.GSetup):
 
-  package = PACKAGE.lower()
-
   # ---------------------------------------------------------------------------
   # Definition of basic parameters for distribution and installation.
   # Please add new files/directories that should be installed here.
@@ -49,7 +47,7 @@
   def set_params (self, params):
   
     # The Work
-    params ["name"]             = self.package
+    params ["name"]             = PACKAGE.lower ()
     params ["version"]          = VERSION
     params ["description"]      = "GNU Enterprise Application Server"
     params ["long_description"] = ""

Modified: trunk/gnue-common/setup.py
===================================================================
--- trunk/gnue-common/setup.py  2005-03-26 19:16:34 UTC (rev 7263)
+++ trunk/gnue-common/setup.py  2005-03-26 19:19:57 UTC (rev 7264)
@@ -387,28 +387,18 @@
   def __install_translations (self):
 
     if os.path.isdir ('po'):
-
-      # find out domain
-      domain = None
+      # copy files
       for f in os.listdir ('po'):
-        if f [-4:] == '.pot':
-          domain = f [:-4]
+        if f [-4:] == '.gmo':
+          src = os.path.join ('po', f)
+          dst = os.path.join (self.install_data, 'share', 'locale', f [:-4],
+                              'LC_MESSAGES')
+          self.mkpath (dst)
+          dst = os.path.join (dst, PACKAGE.lower () + '.mo')
+          self.copy_file (src, dst)
+          # Record file
+          self.__outputs.append (dst)
 
-      if not domain:
-        print "warning: cannot determine domain, not installing translations"
-      else:
-        # copy files
-        for f in os.listdir ('po'):
-          if f [-4:] == '.gmo':
-            src = os.path.join ('po', f)
-            dst = os.path.join (self.install_data, 'share', 'locale', f [:-4],
-                                'LC_MESSAGES')
-            self.mkpath (dst)
-            dst = os.path.join (dst, domain + '.mo')
-            self.copy_file (src, dst)
-            # Record file
-            self.__outputs.append (dst)
-
   # ---------------------------------------------------------------------------
   # install.run: generate and install path dependent files
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/setup/GSetup.py
===================================================================
--- trunk/gnue-common/src/setup/GSetup.py       2005-03-26 19:16:34 UTC (rev 
7263)
+++ trunk/gnue-common/src/setup/GSetup.py       2005-03-26 19:19:57 UTC (rev 
7264)
@@ -122,27 +122,17 @@
 
     # install translations
     if os.path.isdir ('po'):
-
-      # find out domain
-      domain = None
+      # copy files
       for f in os.listdir ('po'):
-        if f [-4:] == '.pot':
-          domain = f [:-4]
+        if f [-4:] == '.gmo':
+          src = os.path.join ('po', f)
+          dst = os.path.join (self.install_data, 'share', 'locale', f [:-4],
+                              'LC_MESSAGES')
+          self.mkpath (dst)
+          dst = os.path.join (dst, _setup.package + '.mo')
+          self.copy_file (src, dst)
+          self.__outputs.append (dst)
 
-      if not domain:
-        print "warning: cannot determine domain, not installing translations"
-      else:
-        # copy files
-        for f in os.listdir ('po'):
-          if f [-4:] == '.gmo':
-            src = os.path.join ('po', f)
-            dst = os.path.join (self.install_data, 'share', 'locale', f [:-4],
-                                'LC_MESSAGES')
-            self.mkpath (dst)
-            dst = os.path.join (dst, domain + '.mo')
-            self.copy_file (src, dst)
-            self.__outputs.append (dst)
-
     distutils.command.install.install.run (self)
 
   # ---------------------------------------------------------------------------
@@ -290,6 +280,9 @@
                    }
 
     _setup.set_params (setup_params)
+
+    # make package available
+    self.package = setup_params ["name"]
     
     # handle version suffix
     try:

Modified: trunk/gnue-designer/setup.py
===================================================================
--- trunk/gnue-designer/setup.py        2005-03-26 19:16:34 UTC (rev 7263)
+++ trunk/gnue-designer/setup.py        2005-03-26 19:19:57 UTC (rev 7264)
@@ -38,8 +38,6 @@
 
 class setup (GSetup.GSetup):
 
-  package = PACKAGE.lower()
-
   # ---------------------------------------------------------------------------
   # Definition of basic parameters for distribution and installation.
   # Please add new files/directories that should be installed here.
@@ -49,7 +47,7 @@
   def set_params (self, params):
   
     # The Work
-    params ["name"]             = self.package
+    params ["name"]             = PACKAGE.lower ()
     params ["version"]          = VERSION
     params ["description"]      = "GNU Enterprise Designer"
     params ["long_description"] = ""

Modified: trunk/gnue-forms/setup.py
===================================================================
--- trunk/gnue-forms/setup.py   2005-03-26 19:16:34 UTC (rev 7263)
+++ trunk/gnue-forms/setup.py   2005-03-26 19:19:57 UTC (rev 7264)
@@ -38,8 +38,6 @@
 
 class setup (GSetup.GSetup):
 
-  package = PACKAGE.lower()
-
   # ---------------------------------------------------------------------------
   # Definition of basic parameters for distribution and installation.
   # Please add new files/directories that should be installed here.
@@ -49,7 +47,7 @@
   def set_params (self, params):
 
     # The Work
-    params ["name"]             = self.package
+    params ["name"]             = PACKAGE.lower ()
     params ["version"]          = VERSION
     params ["description"]      = "GNU Enterprise Forms"
     params ["long_description"] = ""

Modified: trunk/gnue-navigator/setup.py
===================================================================
--- trunk/gnue-navigator/setup.py       2005-03-26 19:16:34 UTC (rev 7263)
+++ trunk/gnue-navigator/setup.py       2005-03-26 19:19:57 UTC (rev 7264)
@@ -38,8 +38,6 @@
 
 class setup (GSetup.GSetup):
 
-  package = PACKAGE.lower()
-
   # ---------------------------------------------------------------------------
   # Definition of basic parameters for distribution and installation.
   # Please add new files/directories that should be installed here.
@@ -49,7 +47,7 @@
   def set_params (self, params):
   
     # The Work
-    params ["name"]             = self.package
+    params ["name"]             = PACKAGE.lower ()
     params ["version"]          = VERSION
     params ["description"]      = "GNU Enterprise Navigator"
     params ["long_description"] = ""

Modified: trunk/gnue-reports/setup.py
===================================================================
--- trunk/gnue-reports/setup.py 2005-03-26 19:16:34 UTC (rev 7263)
+++ trunk/gnue-reports/setup.py 2005-03-26 19:19:57 UTC (rev 7264)
@@ -38,8 +38,6 @@
 
 class setup (GSetup.GSetup):
 
-  package = PACKAGE.lower()
-
   # ---------------------------------------------------------------------------
   # Definition of basic parameters for distribution and installation.
   # Please add new files/directories that should be installed here.
@@ -49,7 +47,7 @@
   def set_params (self, params):
 
     # The Work
-    params ["name"]             = self.package
+    params ["name"]             = PACKAGE.lower ()
     params ["version"]          = VERSION
     params ["description"]      = "GNU Enterprise Reports"
     params ["long_description"] = ""