diff --git a/build.py b/build.py index 17295f12..38eff9ff 100644 --- a/build.py +++ b/build.py @@ -40,14 +40,14 @@ def build_cocoa(edition, dev): build_cocoa_proxy_module() print("Building dg_cocoa.plugin") if dev: - tocopy = ['cocoa/inter'] + tocopy = ['cocoa/inter', 'cocoalib/cocoa'] else: specific_packages = { 'se': ['core_se'], 'me': ['core_me'], 'pe': ['core_pe'], }[edition] - tocopy = ['core', 'hscommon', 'cocoa/inter'] + specific_packages + tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa'] + specific_packages copy_packages(tocopy, 'build') cocoa_project_path = 'cocoa/{0}'.format(edition) shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build') @@ -165,16 +165,16 @@ def build_mergepot(): def build_cocoa_proxy_module(): print("Building Cocoa Proxy") import objp.p2o - objp.p2o.generate_python_proxy_code('hscommon/cocoa/CocoaProxy.h', 'build/CocoaProxy.m') + objp.p2o.generate_python_proxy_code('cocoalib/cocoa/CocoaProxy.h', 'build/CocoaProxy.m') exts = [ - Extension("CocoaProxy", ['hscommon/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m'], + Extension("CocoaProxy", ['cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m'], extra_link_args=["-framework", "CoreFoundation", "-framework", "Foundation", "-framework", "AppKit"]), ] setup( script_args = ['build_ext', '--inplace'], ext_modules = exts, ) - move_all('CocoaProxy*', 'hscommon/cocoa') + move_all('CocoaProxy*', 'cocoalib/cocoa') def build_pe_modules(ui): print("Building PE Modules") diff --git a/cocoa/inter/app.py b/cocoa/inter/app.py index b5e598c5..f7472bc6 100644 --- a/cocoa/inter/app.py +++ b/cocoa/inter/app.py @@ -1,9 +1,9 @@ import logging from jobprogress import job -from hscommon import cocoa -from hscommon.cocoa import install_exception_hook, proxy -from hscommon.cocoa.inter import signature, subproxy, PyFairware +import cocoa +from cocoa import install_exception_hook, proxy +from cocoa.inter import signature, subproxy, PyFairware from hscommon.trans import trget from core.app import JobType diff --git a/cocoa/inter/app_me.py b/cocoa/inter/app_me.py index 3e73ee61..f22affb7 100644 --- a/cocoa/inter/app_me.py +++ b/cocoa/inter/app_me.py @@ -11,7 +11,7 @@ from appscript import app, k, CommandError import time import os.path as op -from hscommon.cocoa import as_fetch +from cocoa import as_fetch from hscommon.trans import tr from core.app import JobType diff --git a/cocoa/inter/app_pe.py b/cocoa/inter/app_pe.py index 08098a1c..51ce2c58 100644 --- a/cocoa/inter/app_pe.py +++ b/cocoa/inter/app_pe.py @@ -16,8 +16,8 @@ from appscript import app, its, CommandError, ApplicationNotFoundError from hscommon import io from hscommon.util import remove_invalid_xml from hscommon.path import Path -from hscommon.cocoa import proxy from hscommon.trans import tr +from cocoa import proxy from core import directories from core_pe import _block_osx diff --git a/cocoa/inter/app_se.py b/cocoa/inter/app_se.py index 4f0b6a72..c5779c2c 100644 --- a/cocoa/inter/app_se.py +++ b/cocoa/inter/app_se.py @@ -11,7 +11,7 @@ import os.path as op from hscommon import io from hscommon.path import Path -from hscommon.cocoa import proxy +from cocoa import proxy from core import fs from core.directories import Directories as DirectoriesBase, DirectoryState diff --git a/cocoa/inter/details_panel.py b/cocoa/inter/details_panel.py index e3cfbdb8..1afe4f92 100644 --- a/cocoa/inter/details_panel.py +++ b/cocoa/inter/details_panel.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import signature, PyGUIObject +from cocoa.inter import signature, PyGUIObject from core.gui.details_panel import DetailsPanel diff --git a/cocoa/inter/directory_outline.py b/cocoa/inter/directory_outline.py index 72d4921c..bdac6a5a 100644 --- a/cocoa/inter/directory_outline.py +++ b/cocoa/inter/directory_outline.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import PyOutline +from cocoa.inter import PyOutline from core.gui.directory_tree import DirectoryTree diff --git a/cocoa/inter/extra_fairware_reminder.py b/cocoa/inter/extra_fairware_reminder.py index e93533c7..97904b1d 100644 --- a/cocoa/inter/extra_fairware_reminder.py +++ b/cocoa/inter/extra_fairware_reminder.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import PyGUIObject +from cocoa.inter import PyGUIObject from core.gui.extra_fairware_reminder import ExtraFairwareReminder diff --git a/cocoa/inter/prioritize_dialog.py b/cocoa/inter/prioritize_dialog.py index 0d9852ac..76d140a5 100644 --- a/cocoa/inter/prioritize_dialog.py +++ b/cocoa/inter/prioritize_dialog.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import PyGUIObject, PySelectableList +from cocoa.inter import PyGUIObject, PySelectableList from core.gui.prioritize_dialog import PrioritizeDialog from .prioritize_list import PyPrioritizeList diff --git a/cocoa/inter/prioritize_list.py b/cocoa/inter/prioritize_list.py index d3d23d84..fd728ad0 100644 --- a/cocoa/inter/prioritize_list.py +++ b/cocoa/inter/prioritize_list.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import signature, PySelectableList +from cocoa.inter import signature, PySelectableList class PyPrioritizeList(PySelectableList): @signature('v@:@i') diff --git a/cocoa/inter/problem_dialog.py b/cocoa/inter/problem_dialog.py index e96992c5..5eb62364 100644 --- a/cocoa/inter/problem_dialog.py +++ b/cocoa/inter/problem_dialog.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import PyGUIObject +from cocoa.inter import PyGUIObject from core.gui.problem_dialog import ProblemDialog diff --git a/cocoa/inter/problem_table.py b/cocoa/inter/problem_table.py index ebff3c28..965e1a75 100644 --- a/cocoa/inter/problem_table.py +++ b/cocoa/inter/problem_table.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import PyTable +from cocoa.inter import PyTable from core.gui.problem_table import ProblemTable diff --git a/cocoa/inter/result_table.py b/cocoa/inter/result_table.py index 620b25e9..ece69101 100644 --- a/cocoa/inter/result_table.py +++ b/cocoa/inter/result_table.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import signature, PyTable +from cocoa.inter import signature, PyTable class PyResultTable(PyTable): @signature('c@:') diff --git a/cocoa/inter/stats_label.py b/cocoa/inter/stats_label.py index f1976e73..e9fc6905 100644 --- a/cocoa/inter/stats_label.py +++ b/cocoa/inter/stats_label.py @@ -1,4 +1,4 @@ -from hscommon.cocoa.inter import PyGUIObject +from cocoa.inter import PyGUIObject from core.gui.stats_label import StatsLabel diff --git a/cocoa/me/dg_cocoa.py b/cocoa/me/dg_cocoa.py index c8c6324e..200d5312 100644 --- a/cocoa/me/dg_cocoa.py +++ b/cocoa/me/dg_cocoa.py @@ -7,7 +7,7 @@ from hscommon.trans import install_gettext_trans_under_cocoa install_gettext_trans_under_cocoa() -from hscommon.cocoa.inter import signature +from cocoa.inter import signature from core.scanner import ScanType diff --git a/cocoa/se/dg_cocoa.py b/cocoa/se/dg_cocoa.py index 01a6efac..3f71c71a 100644 --- a/cocoa/se/dg_cocoa.py +++ b/cocoa/se/dg_cocoa.py @@ -7,7 +7,7 @@ from hscommon.trans import install_gettext_trans_under_cocoa install_gettext_trans_under_cocoa() -from hscommon.cocoa.inter import signature +from cocoa.inter import signature from core.scanner import ScanType diff --git a/requirements-osx.txt b/requirements-osx.txt index d6e23720..8e84104c 100644 --- a/requirements-osx.txt +++ b/requirements-osx.txt @@ -1,4 +1,5 @@ -r requirements.txt pyobjc-core>=2.3 pluginbuilder>=1.0.0 -appscript>=1.0.0 \ No newline at end of file +appscript>=1.0.0 +objp>=0.1.0 \ No newline at end of file