Commits

Virgil Dupras committed 3cfae8c

Fix cocoa build for PE.

appscript and multiprocessing dependencies weren't properly packaged.

  • Participants
  • Parent commits 6e5978c
  • Tags pe2.7.1

Comments (0)

Files changed (2)

 b60149097cd86d7f7b9ab1a23337fa302650f025 cocoalib
-35ac3c18545f0eb39e2442f77f17b03e6213148d hscommon
+9fb7120ebb840245b7a7c859d888e0c6e88d2aaf hscommon
 28a0def7e0b32876dbd4f4dd47d482a45700e341 qtlib
     if not op.exists(pydep_folder):
         os.mkdir(pydep_folder)
     shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
+    appscript_pkgs = ['appscript', 'aem', 'mactypes']
     specific_packages = {
         'se': ['core_se'],
-        'me': ['core_me'],
-        'pe': ['core_pe'],
+        'me': ['core_me'] + appscript_pkgs,
+        'pe': ['core_pe'] + appscript_pkgs,
     }[edition]
     tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'jobprogress', 'objp',
         'send2trash'] + specific_packages
     copy_packages(tocopy, pydep_folder, create_links=dev)
     sys.path.insert(0, 'build')
-    collect_stdlib_dependencies('build/dg_cocoa.py', pydep_folder)
+    extra_deps = None
+    if edition == 'pe':
+        # ModuleFinder can't seem to correctly detect the multiprocessing dependency, so we have
+        # to manually specify it.
+        extra_deps=['multiprocessing']
+    collect_stdlib_dependencies('build/dg_cocoa.py', pydep_folder, extra_deps=extra_deps)
     del sys.path[0]
     # Views are not referenced by python code, so they're not found by the collector.
     copy_all('build/inter/*.so', op.join(pydep_folder, 'inter'))