From 79e925151129154246bc77d1647995c2a6968d14 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 28 Jul 2012 16:49:36 -0400 Subject: [PATCH] Generate cocoalib stuff in the same autogen folder as the rest instead of in its own autogen folder. --HG-- branch : xibless --- build.py | 18 ++++++++---------- cocoa/wscript | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build.py b/build.py index 2cd88d75..04628490 100644 --- a/build.py +++ b/build.py @@ -45,16 +45,14 @@ def parse_args(): def build_xibless(edition): 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', localizationTable='cocoalib') - xibless.generate('cocoalib/ui/fairware_reminder.py', 'cocoalib/autogen/HSFairwareReminder_UI', localizationTable='cocoalib') - xibless.generate('cocoalib/ui/demo_reminder.py', 'cocoalib/autogen/HSDemoReminder_UI', localizationTable='cocoalib') - xibless.generate('cocoalib/ui/enter_code.py', 'cocoalib/autogen/HSEnterCode_UI', localizationTable='cocoalib') - xibless.generate('cocoalib/ui/error_report.py', 'cocoalib/autogen/HSErrorReportWindow_UI', localizationTable='cocoalib') + xibless.generate('cocoalib/ui/progress.py', 'cocoa/autogen/ProgressController_UI') + xibless.generate('cocoalib/ui/about.py', 'cocoa/autogen/HSAboutBox_UI', localizationTable='cocoalib') + xibless.generate('cocoalib/ui/fairware_reminder.py', 'cocoa/autogen/HSFairwareReminder_UI', localizationTable='cocoalib') + xibless.generate('cocoalib/ui/demo_reminder.py', 'cocoa/autogen/HSDemoReminder_UI', localizationTable='cocoalib') + xibless.generate('cocoalib/ui/enter_code.py', 'cocoa/autogen/HSEnterCode_UI', localizationTable='cocoalib') + xibless.generate('cocoalib/ui/error_report.py', 'cocoa/autogen/HSErrorReportWindow_UI', localizationTable='cocoalib') xibless.generate('cocoa/base/ui/ignore_list_dialog.py', 'cocoa/autogen/IgnoreListDialog_UI', localizationTable='Localizable') xibless.generate('cocoa/base/ui/deletion_options.py', 'cocoa/autogen/DeletionOptions_UI', localizationTable='Localizable') xibless.generate('cocoa/base/ui/problem_dialog.py', 'cocoa/autogen/ProblemDialog_UI', localizationTable='Localizable') @@ -217,9 +215,9 @@ def build_cocoa_proxy_module(): 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(edition): print("Building Cocoa Bridging Interfaces") diff --git a/cocoa/wscript b/cocoa/wscript index 54263156..bde056a6 100644 --- a/cocoa/wscript +++ b/cocoa/wscript @@ -35,7 +35,7 @@ def configure(conf): 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 = ['NSEventAdditions', 'Dialogs', 'HSAboutBox', 'HSFairwareReminder', 'Utils', 'HSPyUtil', 'ProgressController', 'HSRecentFiles', 'HSQuicklook', 'ValueTransformers',