colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-07 01:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

blend working with jake build system.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-09-25 23:37:38 -07:00
1 parent 9856e6bfd7
commit 1cd8acb92c
4 files changed
+7 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/Jakefile
+4 -8
View File
@@ -11,7 +11,7 @@ $ENVIRONMENT_THEME_PRODUCT = FILE.join($ENVIRONMENT_PRODUCT, 'Resources', 'Aris
//AppKitFiles = FileList['**/*.j'].exclude('CoreGraphics/CGContextCanvas.j', 'CoreGraphics/CGContextVML.j', 'Themes/**', 'Tools/**')
AppKitFiles = FILE.glob("*.j").concat(FILE.glob("Cib/*.j")).concat(FILE.glob("CoreAnimation/*.j")).concat(FILE.glob("CPWindow/*.j")).concat(FILE.glob("Platform/*.j")).concat(FILE.glob("CoreGraphics/*.j"));
AppKitFiles = FILE.glob("*.j").concat(FILE.glob("Cib/*.j")).concat(FILE.glob("CoreAnimation/*.j")).concat(FILE.glob("CPWindow/*.j")).concat(FILE.glob("Platform/**/*.j")).concat(FILE.glob("Platform/*.j")).concat(FILE.glob("CoreGraphics/*.j"));
appKitTask = framework ("AppKit", function(appKitTask)
{
@@ -57,13 +57,9 @@ $THEME_PRODUCT = FILE.join(appKitTask.buildProductPath(), "Resources", "Aristo.b
ThemeFiles = FILE.glob("Themes/Aristo/*");//FileList['Themes/Aristo/*']
filedir ($THEME_PRODUCT, ThemeFiles, function()
{print("IN HERE");
var blend = OS.popen("blend -d Themes/Aristo/ThemeDescriptors.j -o " + $THEME_PRODUCT + " -R Themes/Aristo/Resources"),
output = "";
while (output = blend.stdout.read())
print(output);
// rake abort if ($? != 0)
{
OS.system("PATH=$PATH:" + OS.enquote(FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective-j", "bin")) + " blend -d Themes/Aristo/ThemeDescriptors.j -o " + $THEME_PRODUCT + " -R Themes/Aristo/Resources");
// rake abort if ($? != 0)
});
task ("build", ["AppKit", $COMMONJS_PRODUCT_APPKIT, $THEME_PRODUCT]);
AppKit/Tools/BlendKit/Jakefile
+1
View File
@@ -16,6 +16,7 @@ blendKitTask = framework ("BlendKit", function(blendKitTask)
blendKitTask.setSources(FILE.glob("*.j")); //t.sources = FileList['*.j']
blendKitTask.setResources(FILE.glob("Resources/*"));
blendKitTask.setLicense(BundleTask.License.LGPL_v2_1);
blendKitTask.setFlattensSources(true); // FIXME: how do we non flatten?
if ($CONFIGURATION === "Release")
blendKitTask.setCompilerFlags("-O");
AppKit/Tools/blend/Jakefile
+1
View File
@@ -16,6 +16,7 @@ app ("blend", function(blendTask)
blendTask.setSources(FILE.glob("*.j"));// = FileList['**/*.j']
blendTask.setResources(FILE.glob("Resources/*"));// t.resources = FileList['Resources/*']
blendTask.setLicense(BundleTask.License.LGPL_v2_1);
blendTask.setFlattensSources(true);
if ($CONFIGURATION === "Release")
blendTask.setCompilerFlags("-O");
Objective-J/CommonJS/objective-j/lib-js/objective-j/jake/bundletask.js
+1 -1
View File
@@ -370,7 +370,6 @@ BundleTask.prototype.defineResourceTask = function(aResourcePath, aDestinationPa
filedir (cibDestinationPath, [aResourcePath], function()
{
OS.system("echo $PATH");
OS.system("nib2cib " + aResourcePath + " " + cibDestinationPath + " " + (this._nib2cibFlags || ""));
});
@@ -499,6 +498,7 @@ BundleTask.prototype.defineSourceTasks = function()
filedir (staticPath, [compiledPlatformSource]);
// FIXME: how do we non flatten?
replacedFiles.push(flattensSources ? FILE.basename(aFilename) : FILE.relative(sourcesPath, aFilename));
}, this);