Merged remote changes.

Mon, 26 Dec 2011 19:35:18 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 26 Dec 2011 19:35:18 +0100
changeset 32
41ddd8e1c06d
parent 31
d8b18ded68ce (current diff)
parent 30
153f0acb2ebb (diff)
child 33
2a3b4b7a633f

Merged remote changes.

PluginCxFreeze.py file | annotate | diff | comparison | revisions
--- a/.hgtags	Mon Dec 26 19:34:28 2011 +0100
+++ b/.hgtags	Mon Dec 26 19:35:18 2011 +0100
@@ -5,3 +5,4 @@
 ce4134fff6ad96384b7ac43487ab933b8ac82b72 release-5.0.0
 54127da8f28d1dd528c51c1659f9e6bb0ec9449a release-5.0.2
 737c623c90df5a833420502b2a822c55a38a9880 release-5.0.4
+bbcf4437e32afc9617bedc28f967c2032b10eb26 release-5.0.5
--- a/PluginCxFreeze.py	Mon Dec 26 19:34:28 2011 +0100
+++ b/PluginCxFreeze.py	Mon Dec 26 19:35:18 2011 +0100
@@ -26,7 +26,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "5.0.5"
+version = "5.0.6"
 className = "CxFreezePlugin"
 packageName = "CxFreeze"
 shortDescription = "Show the CxFreeze dialogs."
@@ -60,10 +60,7 @@
     exe = _findExecutable()
     if exe:
         data["exe"] = exe
-        if "FreezePython" in exe:
-            data["versionStartsWith"] = "FreezePython"
-        elif "cxfreeze" in exe:
-            data["versionStartsWith"] = "cxfreeze"
+        data["versionStartsWith"] = "cxfreeze"
     
     return data
 
@@ -73,7 +70,6 @@
     
     @return name of the executable (string)
     """
-    # step 1: check for version 4.x
     if Utilities.isWindowsPlatform():
         #
         # Windows
@@ -114,7 +110,7 @@
         #
         # Linux, Unix ...
         cxfreezeScript = 'cxfreeze'
-        # There could be multiple pylint executables in the path
+        # There could be multiple cxfreeze executables in the path
         # e.g. for different python variants
         path = Utilities.getEnvironmentEntry('PATH')
         # environment variable not defined

eric ide

mercurial