Changeset 5025 for branch/umitweb-ng/install_scripts/macosx

Timestamp:

07/09/09 11:25:39 (4 years ago)

Author:

rcarvalho

Message:

Merged revisions 4366-4380 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

................

r4366 | gpolo | 2009-03-14 18:11:21 -0300 (Sáb, 14 Mar 2009) | 1 line

Fixed ticket #241: Temporarily rename bin/umit to bin/umit.py if py2app is supposed to be executed so it works properly.

................

r4367 | gpolo | 2009-03-14 18:14:20 -0300 (Sáb, 14 Mar 2009) | 1 line

Use the current UMIT_MAIN when patching it (this is somewhat a continuation of ticket #241).

................

r4368 | gpolo | 2009-03-15 13:14:31 -0300 (Dom, 15 Mar 2009) | 1 line

Rename bin/umit to bin/umit_main.py instead to not cause problems with the umit package.

................

r4369 | gpolo | 2009-03-15 13:25:24 -0300 (Dom, 15 Mar 2009) | 1 line

Added some includes.

................

r4370 | gpolo | 2009-03-15 13:28:28 -0300 (Dom, 15 Mar 2009) | 1 line

We don't need to store the old stdout and stderr, sys already does it for us.

................

r4371 | gpolo | 2009-03-15 13:34:53 -0300 (Dom, 15 Mar 2009) | 1 line

Just "import gtk" matters here.

................

r4372 | gpolo | 2009-03-15 13:38:27 -0300 (Dom, 15 Mar 2009) | 1 line

Cleaning tempfile imports.

................

r4373 | gpolo | 2009-03-15 13:40:30 -0300 (Dom, 15 Mar 2009) | 1 line

ImportError? handling moved to top.

................

r4374 | gpolo | 2009-03-15 13:49:07 -0300 (Dom, 15 Mar 2009) | 1 line

Use the nmap_command_path to run nmap if possible.

................

r4375 | gpolo | 2009-03-15 13:50:14 -0300 (Dom, 15 Mar 2009) | 1 line

Forgot to revert UMIT_DEVELOPMENT.

................

r4376 | gpolo | 2009-03-15 14:06:31 -0300 (Dom, 15 Mar 2009) | 1 line

Added utility function to correctly get the desired value of UMIT_DEVELOPMENT env var.

................

r4377 | gpolo | 2009-03-15 14:10:22 -0300 (Dom, 15 Mar 2009) | 1 line

Use the new umit.core.Utils.development_mode function.

................

r4378 | gpolo | 2009-03-15 14:20:08 -0300 (Dom, 15 Mar 2009) | 1 line

Use the new development_mode function.

................

r4379 | nopper | 2009-03-18 11:23:08 -0300 (Qua, 18 Mar 2009) | 1 line

Committing patch for ticket #243

................

r4380 | nopper | 2009-03-18 15:26:44 -0300 (Qua, 18 Mar 2009) | 9 lines

Merged revisions 4262 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/UmitPlugins

........

r4262 | nopper | 2009-03-04 15:28:04 +0100 (Wed, 04 Mar 2009) | 1 line

print replaced with log.debug() function of UmitLogging?

........

................

Location:

branch/umitweb-ng

Files:

• . (modified) (1 prop)
• install_scripts/macosx/py2app_setup.py (modified) (1 diff)

branch/umitweb-ng/install_scripts/macosx/py2app_setup.py

@@ -24 +24 @@
 from setuptools import setup
 
-from install_scripts.common import BIN_DIRNAME
+from install_scripts import common
+
+# py2app requires the values in the app's list to have known extensions, but
+# bin/umit doesn't. Here bin/umit is renamed to bin/umit_main.py and the old
+# name is stored in common.OLD_UMIT_MAIN so it can be renamed again later.
+import shutil
+shutil.move(common.UMIT_MAIN, common.UMIT_MAIN + '_main.py')
+common.OLD_UMIT_MAIN = common.UMIT_MAIN
+common.UMIT_MAIN = os.path.join(common.BIN_DIRNAME, 'umit_main.py')
+
+def revert_rename():
+    if not hasattr(common, 'OLD_UMIT_MAIN'):
+        # The rename hasn't happened.
+        return
+    shutil.move(common.UMIT_MAIN, common.OLD_UMIT_MAIN)
 
 py2app_options = dict(
-        app = [os.path.join(BIN_DIRNAME, 'umit')],
-        options = {'py2app': {'argv_emulation': True, 'compressed': True}},
+        app = [common.UMIT_MAIN],
+        options = {'py2app': {
+            'argv_emulation': True,
+            'compressed': True,
+            'includes': ['gtk', 'pango', 'atk', 'gobject', 'pangocairo']}
+            },
         setup_requires = ["py2app"]
         )