From cdaed5093967bac79980c7e23831830a70a45ed5 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Tue, 8 Jan 2013 15:03:14 -0800 Subject: [PATCH] Readd Aristo1 build process Cappuccino will now continue to support Aristo1 By default Aristo2 will be used, unless you add in your Info.plist CPDefaultTheme Aristo In that case Aristo2 will be use. If you put CPDefaultTheme MyCustomTheme It will use your custom theme as usual from your app's Resource folder --- AppKit/CPApplication.j | 2 +- AppKit/Jakefile | 3 +++ AppKit/Themes/Jakefile | 2 +- CommonJS/bin/flatten | 2 +- CommonJS/bin/press | 2 +- Jakefile | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j index 60de69796..ffc651232 100644 --- a/AppKit/CPApplication.j +++ b/AppKit/CPApplication.j @@ -1300,7 +1300,7 @@ var _CPAppBootstrapperActions = nil; var defaultThemeName = [CPApplication defaultThemeName], themeURL = nil; - if (defaultThemeName === @"Aristo2") + if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2") themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"]; else themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"]; diff --git a/AppKit/Jakefile b/AppKit/Jakefile index 9802e587f..b465b9f15 100644 --- a/AppKit/Jakefile +++ b/AppKit/Jakefile @@ -52,6 +52,9 @@ task ("Theme", [$BUILD_CJS_CAPPUCCINO_APPKIT], function() { subjake(["Themes"], "build"); + cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo.blend')); + cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo.blend")); + cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo2.blend')); cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend")); }); diff --git a/AppKit/Themes/Jakefile b/AppKit/Themes/Jakefile index 60985502b..37458f433 100644 --- a/AppKit/Themes/Jakefile +++ b/AppKit/Themes/Jakefile @@ -1,4 +1,4 @@ require("../../common.jake"); -subtasks(["BlendKit", "CommonJS", "Aristo2"], ["build", "clean", "clobber"]); +subtasks(["BlendKit", "CommonJS", "Aristo", "Aristo2"], ["build", "clean", "clobber"]); diff --git a/CommonJS/bin/flatten b/CommonJS/bin/flatten index 75e0f9b4b..80b9ecf8e 100755 --- a/CommonJS/bin/flatten +++ b/CommonJS/bin/flatten @@ -116,7 +116,7 @@ function main(args) var defaultThemeName = [CPApplication defaultThemeName], bundle = nil; - if (defaultThemeName === @"Aristo2") + if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2") bundle = [CPBundle bundleForClass:[CPApplication class]]; else bundle = [CPBundle mainBundle]; diff --git a/CommonJS/bin/press b/CommonJS/bin/press index 75fa8fbcf..c4e6b5571 100755 --- a/CommonJS/bin/press +++ b/CommonJS/bin/press @@ -132,7 +132,7 @@ function press(rootPath, outputPath, options) { var themeName = outputInfoPlist.valueForKey("CPDefaultTheme") || "Aristo2", themePath = nil; - if (themeName === "Aristo2") + if (themeName === "Aristo" || themeName === "Aristo2") themePath = FILE.join(outputPath, options.frameworks, "AppKit", "Resources", themeName+".blend"); else themePath = FILE.join(outputPath, "Resources", themeName + ".blend"); diff --git a/Jakefile b/Jakefile index 02902e709..754b336cb 100644 --- a/Jakefile +++ b/Jakefile @@ -91,10 +91,10 @@ task ("clean-sprites", function() task ("clobber-theme", function() { - var f = new FileList(FILE.join(SYSTEM.env.CAPP_BUILD, "**/Aristo2.blend")), + var f = new FileList(FILE.join(SYSTEM.env.CAPP_BUILD, "**/Aristo.blend"), FILE.join(SYSTEM.env.CAPP_BUILD, "**/Aristo2.blend")), paths = f.items(); - f = new FileList(FILE.join(SYSTEM.env.CAPP_BUILD, "Aristo2.build")); + f = new FileList(FILE.join(SYSTEM.env.CAPP_BUILD, "Aristo.build"), FILE.join(SYSTEM.env.CAPP_BUILD, "Aristo2.build")); paths = paths.concat(f.items()); paths.forEach(function(path)