Commits

Ronald Oussoren committed 3c669e6

New prebuilt binaries

  • Participants
  • Parent commits 209a961

Comments (0)

Files changed (20)

File py2app/apptemplate/prebuilt/main-fat

Binary file modified.

File py2app/apptemplate/prebuilt/main-fat3

Binary file modified.

File py2app/apptemplate/prebuilt/main-i386

Binary file modified.

File py2app/apptemplate/prebuilt/main-intel

Binary file modified.

File py2app/apptemplate/prebuilt/main-ppc

Binary file modified.

File py2app/apptemplate/prebuilt/main-ppc64

Binary file modified.

File py2app/apptemplate/prebuilt/main-universal

Binary file modified.

File py2app/apptemplate/prebuilt/main-x86_64

Binary file modified.

File py2app/apptemplate/setup.py

     },
     {
         'name': 'main-i386',
-        'target': '10.3',
+        #'target': '10.3',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386',
+        'target': '10.4',
         'cflags': '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386',
         'cc': 'gcc-4.0',
     },
     {
         'name': 'main-ppc',
-        'target': '10.3',
+        #'target': '10.3',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc',
+        'target': '10.4',
         'cflags': '-isysroot /Xcode4/SDKs/MacOSX10.5.sdk -arch ppc',
         'cc': 'gcc-4.0',
     },
     {
         'name': 'main-fat',
-        'target': '10.3',
+        #'target': '10.3',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc',
+        'target': '10.4',
         'cflags': '-isysroot /Xcode4/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc',
         'cc': 'gcc-4.0',
     },

File py2app/apptemplate/src/main.c

 
 typedef int PyObject;
 typedef PyObject* (*Py_BuildValuePtr)(const char*, ...);
+#if 0
 typedef void (*Py_SetPathPtr)(const wchar_t*);
+#endif
 typedef int (*PySys_SetObjectPtr)(const char*, PyObject*);
 typedef void (*Py_SetProgramNamePtr)(const char *);
 typedef void (*Py_InitializePtr)(void); 
     LOOKUP(PySys_SetArgv);
     LOOKUP(PyObject_GetAttrString);
     LOOKUP(Py_BuildValue);
+#if 0
     OPT_LOOKUP(Py_SetPath);
+#endif
     LOOKUP(PySys_SetObject);
 
 

File py2app/bundletemplate/prebuilt/main-fat

Binary file modified.

File py2app/bundletemplate/prebuilt/main-fat3

Binary file modified.

File py2app/bundletemplate/prebuilt/main-i386

Binary file modified.

File py2app/bundletemplate/prebuilt/main-intel

Binary file modified.

File py2app/bundletemplate/prebuilt/main-ppc

Binary file modified.

File py2app/bundletemplate/prebuilt/main-ppc64

Binary file modified.

File py2app/bundletemplate/prebuilt/main-universal

Binary file modified.

File py2app/bundletemplate/prebuilt/main-x86_64

Binary file modified.

File py2app/bundletemplate/setup.py

         'name': 'main-universal',
         'target': '10.5',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc -arch ppc64 -arch x86_64',
-        'cflags': '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch ppc -arch ppc64 -arch x86_64',
+        'cflags': '-isysroot /Xcode4/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc -arch ppc64 -arch x86_64',
         'cc': 'gcc-4.2',
     },
     {
         'name': 'main-ppc64',
         'target': '10.5',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64',
-        'cflags': '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch x86_64',
+        'cflags': '-isysroot /Xcode4/SDKs/MacOSX10.5.sdk -arch x86_64',
         'cc': 'gcc-4.2',
     },
     {
     },
     {
         'name': 'main-i386',
-        'target': '10.3',
+        #'target': '10.3',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386',
+        'target': '10.4',
         'cflags': '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386',
         'cc': 'gcc-4.0',
     },
     {
         'name': 'main-ppc',
-        'target': '10.3',
+        #'target': '10.3',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc',
-        'cflags': '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch ppc',
-        'cc': 'gcc-4.0',
+        'target': '10.4',
+        'cflags': '-isysroot /Xcode4/SDKs/MacOSX10.6.sdk -arch ppc',
+        'cc': 'gcc-4.2',
     },
     {
         'name': 'main-fat',
-        'target': '10.3',
+        #'target': '10.3',
         #'cflags': '-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc',
-        'cflags': '-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch ppc',
-        'cc': 'gcc-4.0',
+        'target': '10.4',
+        'cflags': '-isysroot /Xcode4/SDKs/MacOSX10.6.sdk -arch i386 -arch ppc',
+        'cc': 'gcc-4.2',
     },
 ]
 

File py2app_tests/test_argv_emulation.py

     # 
 
     def test_basic_start(self):
+        self.maxDiff = None
         path = os.path.join( self.app_dir, 'dist/BasicApp.app')
 
         p = subprocess.Popen(["/usr/bin/open",
         self.assertEqual(exit, 0)
 
         path = os.path.join( self.app_dir, 'dist/argv.txt')
-        for x in xrange(5):
+        for x in range(5):
             time.sleep(1)
             if os.path.exists(path):
                 break
         data = fp.read().strip()
         fp.close()
 
-        self.assertEquals(data.strip(), repr([os.path.join(self.app_dir, 'dist/BasicApp.app/Contents/Resources/main.py')]))
+        self.assertEqual(data.strip(), repr([os.path.join(self.app_dir, 'dist/BasicApp.app/Contents/Resources/main.py')]))
 
     def test_start_with_args(self):
+        self.maxDiff = None
         path = os.path.join( self.app_dir, 'dist/BasicApp.app')
 
         p = subprocess.Popen(["/usr/bin/open",
 
         self.assertEqual(exit, 0)
 
-        for x in xrange(5):
+        for x in range(5):
             time.sleep(1)
             if os.path.exists(path):
                 break
         data = fp.read().strip()
         fp.close()
 
-        self.assertEquals(data.strip(), repr([os.path.join(self.app_dir, 'dist/BasicApp.app/Contents/Resources/main.py'), '/usr/bin/ssh']))
+        self.assertEqual(data.strip(), repr([os.path.join(self.app_dir, 'dist/BasicApp.app/Contents/Resources/main.py'), '/usr/bin/ssh']))