[gnue] r9942 - in trunk: gnue-appserver/src gnue-common/src/base gnue-common/utils gnue-designer/src gnue-forms/src gnue-navigator/src gnue-reports/src

[reinhard]

Author: reinhard
Date: 2009-10-07 10:06:24 -0500 (Wed, 07 Oct 2009)
New Revision: 9942

Modified:
   trunk/gnue-appserver/src/__init__.py
   trunk/gnue-common/src/base/version.py
   trunk/gnue-common/utils/announce-release
   trunk/gnue-common/utils/make-packages
   trunk/gnue-common/utils/release
   trunk/gnue-designer/src/__init__.py
   trunk/gnue-forms/src/__init__.py
   trunk/gnue-navigator/src/__init__.py
   trunk/gnue-reports/src/__init__.py
Log:
Some fixes for package building.


Modified: trunk/gnue-appserver/src/__init__.py
===================================================================
--- trunk/gnue-appserver/src/__init__.py        2009-10-07 15:05:28 UTC (rev 
9941)
+++ trunk/gnue-appserver/src/__init__.py        2009-10-07 15:06:24 UTC (rev 
9942)
@@ -28,19 +28,15 @@
 
 try:
     import svnrev
-    svn_revision = svnrev.svnrev
+    __svn_revision__ = svnrev.svnrev
 except ImportError:
-    svn_revision = None
+    __svn_revision__ = None
 
+__version__ = version.Version(0, 5, 'final', 2, __svn_revision__)
+
 PACKAGE = "GNUe-AppServer"
 TITLE = "GNUe Application Server"
+VERSION = __version__.get_version()
+HEXVERSION = __version__.get_hexversion()
 
-version = version.Version(0, 5, 'final', 2, svn_revision)
-
-VERSION = version.get_version()
-HEXVERSION = version.get_hexversion()
-
-__version__ = VERSION
-__hexversion__ = HEXVERSION
-
 __gettext_domain__ = "gnue-appserver"

Modified: trunk/gnue-common/src/base/version.py
===================================================================
--- trunk/gnue-common/src/base/version.py       2009-10-07 15:05:28 UTC (rev 
9941)
+++ trunk/gnue-common/src/base/version.py       2009-10-07 15:06:24 UTC (rev 
9942)
@@ -73,11 +73,11 @@
 package root::
     try:
         import svnrev
-        svn_revision = svnrev.svnrev
+        __svn_revision__ = svnrev.svnrev
     except ImportError:
-        svn_revision = None
+        __svn_revision__ = None
     from gnue.common.base import version
-    __version__ = version.Version(0, 1, 'alpha', 1, svn_revision)
+    __version__ = version.Version(0, 1, 'alpha', 1, __svn_revision__)
 
 The above example supports a file "svnrev.py" which defines the Subversion
 snapshot.  This makes it possible to show the full version number of a snapshot

Modified: trunk/gnue-common/utils/announce-release
===================================================================
--- trunk/gnue-common/utils/announce-release    2009-10-07 15:05:28 UTC (rev 
9941)
+++ trunk/gnue-common/utils/announce-release    2009-10-07 15:06:24 UTC (rev 
9942)
@@ -12,9 +12,9 @@
 
 package=$(basename $(pwd) | sed -e 's/gnue-//')
 title=$(gcvs -c "import src; print src.TITLE")
-version=$(gcvs -c "import src; print src.version.get_version()")
-phase=$(gcvs -c "import src; print src.version.phase")
-build=$(gcvs -c "import src; print src.version.build")
+version=$(gcvs -c "import src; print src.__version__.get_version()")
+phase=$(gcvs -c "import src; print src.__version__.phase")
+build=$(gcvs -c "import src; print src.__version__.build")
 
 echo "$(date --iso-8601=seconds) Announcing version $version of gnue-$package"
 

Modified: trunk/gnue-common/utils/make-packages
===================================================================
--- trunk/gnue-common/utils/make-packages       2009-10-07 15:05:28 UTC (rev 
9941)
+++ trunk/gnue-common/utils/make-packages       2009-10-07 15:06:24 UTC (rev 
9942)
@@ -7,7 +7,7 @@
 fi
 
 package=$(basename $(pwd) | sed -e 's/gnue-//')
-version=$(gcvs -c "import src; print src.version.get_version()")
+version=$(gcvs -c "import src; print src.__version__.get_version()")
 
 echo "$(date --iso-8601=seconds) Packaging gnue-${package} ${version}."
 

Modified: trunk/gnue-common/utils/release
===================================================================
--- trunk/gnue-common/utils/release     2009-10-07 15:05:28 UTC (rev 9941)
+++ trunk/gnue-common/utils/release     2009-10-07 15:06:24 UTC (rev 9942)
@@ -9,11 +9,11 @@
 export GNUE_BUILD="Y"
 
 package=$(basename $(pwd) | sed -e 's/gnue-//')
-version=$(gcvs -c "import src; print src.version.get_version()")
-major=$(gcvs -c "import src; print src.version.major")
-minor=$(gcvs -c "import src; print src.version.minor")
-phase=$(gcvs -c "import src; print src.version.phase")
-build=$(gcvs -c "import src; print src.version.build")
+version=$(gcvs -c "import src; print src.__version__.get_version()")
+major=$(gcvs -c "import src; print src.__version__.major")
+minor=$(gcvs -c "import src; print src.__version__.minor")
+phase=$(gcvs -c "import src; print src.__version__.phase")
+build=$(gcvs -c "import src; print src.__version__.build")
 
 echo "$(date --iso-8601=seconds) Building gnue-$package $version"
 

Modified: trunk/gnue-designer/src/__init__.py
===================================================================
--- trunk/gnue-designer/src/__init__.py 2009-10-07 15:05:28 UTC (rev 9941)
+++ trunk/gnue-designer/src/__init__.py 2009-10-07 15:06:24 UTC (rev 9942)
@@ -28,19 +28,15 @@
 
 try:
     import svnrev
-    svn_revision = svnrev.svnrev
+    __svn_revision__ = svnrev.svnrev
 except ImportError:
-    svn_revision = None
+    __svn_revision__ = None
 
+__version__ = version.Version(0, 5, 'final', 7, __svn_revision__)
+
 PACKAGE = "GNUe-Designer"
 TITLE = "GNUe Designer"
+VERSION = __version__.get_version()
+HEXVERSION = __version__.get_hexversion()
 
-version = version.Version(0, 5, 'final', 7, svn_revision)
-
-VERSION = version.get_version()
-HEXVERSION = version.get_hexversion()
-
-__version__ = VERSION
-__hexversion__ = HEXVERSION
-
 __gettext_domain__ = "gnue-designer"

Modified: trunk/gnue-forms/src/__init__.py
===================================================================
--- trunk/gnue-forms/src/__init__.py    2009-10-07 15:05:28 UTC (rev 9941)
+++ trunk/gnue-forms/src/__init__.py    2009-10-07 15:06:24 UTC (rev 9942)
@@ -28,19 +28,15 @@
 
 try:
     import svnrev
-    svn_revision = svnrev.svnrev
+    __svn_revision__ = svnrev.svnrev
 except ImportError:
-    svn_revision = None
+    __svn_revision__ = None
 
+__version__ = version.Version(0, 6, 'final', 1, __svn_revision__)
+
 PACKAGE = "GNUe-Forms"
 TITLE = "GNU Enterprise Forms"
+VERSION = __version__.get_version()
+HEXVERSION = __version__.get_hexversion()
 
-version = version.Version(0, 6, 'final', 1, svn_revision)
-
-VERSION = version.get_version()
-HEXVERSION = version.get_hexversion()
-
-__version__ = VERSION
-__hexversion__ = HEXVERSION
-
 __gettext_domain__ = "gnue-forms"

Modified: trunk/gnue-navigator/src/__init__.py
===================================================================
--- trunk/gnue-navigator/src/__init__.py        2009-10-07 15:05:28 UTC (rev 
9941)
+++ trunk/gnue-navigator/src/__init__.py        2009-10-07 15:06:24 UTC (rev 
9942)
@@ -28,19 +28,15 @@
 
 try:
     import svnrev
-    svn_revision = svnrev.svnrev
+    __svn_revision__ = svnrev.svnrev
 except ImportError:
-    svn_revision = None
+    __svn_revision__ = None
 
+__version__ = version.Version(0, 1, 'alpha', 0, __svn_revision__)
+
 PACKAGE = "GNUe-Navigator"
 TITLE = "GNUe Navigator"
+VERSION = __version__.get_version()
+HEXVERSION = __version__.get_hexversion()
 
-version = version.Version(0, 1, 'alpha', 0, svn_revision)
-
-VERSION = version.get_version()
-HEXVERSION = version.get_hexversion()
-
-__version__ = VERSION
-__hexversion__ = HEXVERSION
-
 __gettext_domain__ = "gnue-navigator"

Modified: trunk/gnue-reports/src/__init__.py
===================================================================
--- trunk/gnue-reports/src/__init__.py  2009-10-07 15:05:28 UTC (rev 9941)
+++ trunk/gnue-reports/src/__init__.py  2009-10-07 15:06:24 UTC (rev 9942)
@@ -28,19 +28,15 @@
 
 try:
     import svnrev
-    svn_revision = svnrev.svnrev
+    __svn_revision__ = svnrev.svnrev
 except ImportError:
-    svn_revision = None
+    __svn_revision__ = None
 
+__version__ = version.Version(0, 2, 'beta', 1, __svn_revision__)
+
 PACKAGE = "GNUe-Reports"
 TITLE = "GNUe Reports"
+VERSION = __version__.get_version()
+HEXVERSION = __version__.get_hexversion()
 
-version = version.Version(0, 2, 'beta', 1, svn_revision)
-
-VERSION = version.get_version()
-HEXVERSION = version.get_hexversion()
-
-__version__ = VERSION
-__hexversion__ = HEXVERSION
-
 __gettext_domain__ = "gnue-reports"