colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Readd Aristo1 build process

Browse Source 
Cappuccino will now continue to support Aristo1
By default Aristo2 will be used, unless you add in your Info.plist

<key>CPDefaultTheme</key>
<string>Aristo</string>

In that case Aristo2 will be use.

If you put

<key>CPDefaultTheme</key>
<string>MyCustomTheme</string>

It will use your custom theme as usual from your app's Resource folder
This commit is contained in:
Antoine Mercadal
2013-01-08 15:03:14 -08:00
parent 5a155020e6
commit cdaed50939
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPApplication.j
+1 -1
View File
@@ -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"];
AppKit/Jakefile
+3
View File
@@ -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"));
});
AppKit/Themes/Jakefile
+1 -1
View File
@@ -1,4 +1,4 @@
require("../../common.jake");
subtasks(["BlendKit", "CommonJS", "Aristo2"], ["build", "clean", "clobber"]);
subtasks(["BlendKit", "CommonJS", "Aristo", "Aristo2"], ["build", "clean", "clobber"]);
CommonJS/bin/flatten
+1 -1
View File
@@ -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];
CommonJS/bin/press
+1 -1
View File
@@ -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");
Jakefile
+2 -2
View File
@@ -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)