Moved hscommon.cocoa to cocoalib.

--HG--
branch : objp

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")

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

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

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

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

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
 

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
 

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
 

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

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')

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
 

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
 

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@:')

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
 

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
 

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
 

requirements-osx.txt

@@ -1,4 +1,5 @@
 -r requirements.txt
 pyobjc-core>=2.3
 pluginbuilder>=1.0.0
-appscript>=1.0.0
+appscript>=1.0.0
+objp>=0.1.0