Commits

Virgil Dupras committed 103f9c7

Generate cocoalib UIs in cocoa/autogen instead of cocoalib/autogen.

This is to avoid a duplicate XiblessSupport unit.

  • Participants
  • Parent commits 824c532

Comments (0)

Files changed (2)

 
 def build_xibless():
     import xibless
-    if not op.exists('cocoalib/autogen'):
-        os.mkdir('cocoalib/autogen')
     if not op.exists('cocoa/autogen'):
         os.mkdir('cocoa/autogen')
-    xibless.generate('cocoalib/ui/progress.py', 'cocoalib/autogen/ProgressController_UI')
-    xibless.generate('cocoalib/ui/about.py', 'cocoalib/autogen/HSAboutBox_UI')
-    xibless.generate('cocoalib/ui/fairware_reminder.py', 'cocoalib/autogen/HSFairwareReminder_UI')
-    xibless.generate('cocoalib/ui/demo_reminder.py', 'cocoalib/autogen/HSDemoReminder_UI')
-    xibless.generate('cocoalib/ui/enter_code.py', 'cocoalib/autogen/HSEnterCode_UI')
-    xibless.generate('cocoalib/ui/error_report.py', 'cocoalib/autogen/HSErrorReportWindow_UI')
+    xibless.generate('cocoalib/ui/progress.py', 'cocoa/autogen/ProgressController_UI')
+    xibless.generate('cocoalib/ui/about.py', 'cocoa/autogen/HSAboutBox_UI')
+    xibless.generate('cocoalib/ui/fairware_reminder.py', 'cocoa/autogen/HSFairwareReminder_UI')
+    xibless.generate('cocoalib/ui/demo_reminder.py', 'cocoa/autogen/HSDemoReminder_UI')
+    xibless.generate('cocoalib/ui/enter_code.py', 'cocoa/autogen/HSEnterCode_UI')
+    xibless.generate('cocoalib/ui/error_report.py', 'cocoa/autogen/HSErrorReportWindow_UI')
     xibless.generate('cocoa/ui/edit_pane.py', 'cocoa/autogen/PMEditPane_UI')
     xibless.generate('cocoa/ui/build_pane.py', 'cocoa/autogen/PMBuildPane_UI')
     xibless.generate('cocoa/ui/page_pane.py', 'cocoa/autogen/PMPageController_UI')
     objp.p2o.generate_python_proxy_code('cocoalib/cocoa/CocoaProxy.h', 'build/CocoaProxy.m')
     build_cocoa_ext("CocoaProxy", 'cocoalib/cocoa',
         ['cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m',
-            'cocoalib/HSErrorReportWindow.m', 'cocoalib/autogen/HSErrorReportWindow_UI.m'],
+            'cocoalib/HSErrorReportWindow.m', 'cocoa/autogen/HSErrorReportWindow_UI.m'],
         ['AppKit', 'CoreServices'],
-        ['cocoalib', 'cocoalib/autogen'])
+        ['cocoalib', 'cocoa/autogen'])
 
 def build_cocoa_bridging_interfaces():
     print("Building Cocoa Bridging Interfaces")

File cocoa/wscript

 def build(ctx):
     # What do we compile?
     cocoalib_node = ctx.srcnode.find_dir('..').find_dir('cocoalib')
-    cocoalib_folders = ['autogen', 'controllers', 'views']
+    cocoalib_folders = ['controllers', 'views']
     cocoalib_includes = [cocoalib_node] + [cocoalib_node.find_dir(folder) for folder in cocoalib_folders]
     cocoalib_uses = ['HSGeometry', 'Dialogs', 'HSAboutBox', 'HSFairwareReminder', 'NSEventAdditions',
         'Utils', 'HSPyUtil', 'ProgressController', 'views/HSTableView', 'controllers/HSColumns',
         'controllers/HSGUIController', 'controllers/HSTable', 'controllers/HSTextField']
-    cocoalib_src = [cocoalib_node.find_node(usename + '.m') for usename in cocoalib_uses] + cocoalib_node.ant_glob('autogen/*.m')
+    cocoalib_src = [cocoalib_node.find_node(usename + '.m') for usename in cocoalib_uses]
     project_folders = ['autogen', 'controllers', 'views']
     project_src = sum([ctx.srcnode.ant_glob('%s/*.m' % folder) for folder in project_folders], ctx.srcnode.ant_glob('*.m'))