Merge remote-tracking branch 'origin/stable' into stable

cool-RR · cool-RR · commit 48b481fb49cc · 2011-09-29T13:35:59.000+02:00
diff --git a/garlicsim/garlicsim/bootstrap/bootstrap.py b/garlicsim/garlicsim/bootstrap/bootstrap.py
@@ -22,6 +22,7 @@
 
 
 frozen = getattr(sys, 'frozen', None)
+is_pypy = ('__pypy__' in sys.builtin_module_names)
 
 
 def __check_prerequisites():
@@ -69,7 +70,7 @@ def check_distribute():
             return []
         
     def check_pywin32():
-        if not sys.platform == 'win32':
+        if not sys.platform == 'win32' or is_pypy: # todo: should check CPython
             return []
         try:
             import win32api
diff --git a/misc/IDE files/Wing/garlicsim.wpr b/misc/IDE files/Wing/garlicsim.wpr
@@ -30,7 +30,25 @@ proj.directory-list = [{'dirloc': loc('../../..'),
                         'recursive': True,
                         'watch_for_changes': True}]
 proj.file-type = 'shared'
+proj.home-dir = loc('../../..')
 proj.main-file = loc('../../../run_gui.py')
+proj.pypath = {None: ('custom',
+                      ':${WING:PROJECT_HOME}/garlicsim:;${WING:PROJECT_HOME}'\
+                      '/garlicsim;:${WING:PROJECT_HOME}/garlicsim_lib:;${WIN'\
+                      'G:PROJECT_HOME}/garlicsim_lib;:${WING:PROJECT_HOME}/g'\
+                      'arlicsim_wx:;${WING:PROJECT_HOME}/garlicsim_wx;'),
+               loc('../../../run_tests.py'): ('custom',
+        '')}
+proj.shared-attribute-names = ['proj.shared-attribute-names',
+                               'proj.directory-list',
+                               'proj.file-list',
+                               'proj.file-type',
+                               'proj.main-file',
+                               'testing.test-file-list',
+                               'testing.auto-test-file-specs',
+                               'testing.test-framework',
+                               'proj.home-dir',
+                               'proj.pypath']
 testing.auto-test-file-specs = ('test_garlicsim/test*.py',
                                 'test_garlicsim_lib/test*.py',
                                 'test_garlicsim_wx/test*.py')
diff --git a/run_gui.py b/run_gui.py
@@ -5,7 +5,7 @@
 
 '''A little module to start the `garlicsim_wx` GUI without installing it.'''
 
-import sys 
+import sys
 import os.path
 
 
@@ -40,4 +40,4 @@ def start():
     
 
 if __name__ == '__main__':
-    start()
+    start()
