From a8ab16002e521621dc9d4c896bbd75899cf580bd Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Wed, 23 Sep 2009 16:27:52 -0700 Subject: [PATCH] More jakefiles and fixing incorrect commonjs package structure. Reviewed by me. --- Foundation/Jakefile | 18 ++++----------- Objective-J/CommonJS/Jakefile | 17 ++++++++++++++ Objective-J/CommonJS/objective-j/lib/jake.js | 5 ---- .../objective-j/lib/objective-j/jake.js | 10 ++++++++ .../{ => objective-j}/jake/LICENSES/LGPL-v2.1 | 0 .../lib/{ => objective-j}/jake/LICENSES/MIT | 0 .../lib/{ => objective-j}/jake/bundletask.js | 23 ++++++++++--------- .../{ => objective-j}/jake/frameworktask.js | 10 ++++---- Objective-J/Jakefile | 2 +- 9 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 Objective-J/CommonJS/Jakefile delete mode 100644 Objective-J/CommonJS/objective-j/lib/jake.js create mode 100644 Objective-J/CommonJS/objective-j/lib/objective-j/jake.js rename Objective-J/CommonJS/objective-j/lib/{ => objective-j}/jake/LICENSES/LGPL-v2.1 (100%) rename Objective-J/CommonJS/objective-j/lib/{ => objective-j}/jake/LICENSES/MIT (100%) rename Objective-J/CommonJS/objective-j/lib/{ => objective-j}/jake/bundletask.js (95%) rename Objective-J/CommonJS/objective-j/lib/{ => objective-j}/jake/frameworktask.js (56%) diff --git a/Foundation/Jakefile b/Foundation/Jakefile index cb9233328..472478a16 100644 --- a/Foundation/Jakefile +++ b/Foundation/Jakefile @@ -1,17 +1,15 @@ #!/usr/bin/env narwhal -print("ok"); -var FILE = require("file"), - bundle = require(FILE.absolute("/Users/tolmasky/Development/Cappuccino/Objective-J/commonJS/objective-j/lib/jake/bundletask")).bundle, - BundleTask = require(FILE.absolute("/Users/tolmasky/Development/Cappuccino/Objective-J/commonJS/objective-j/lib/jake/bundletask")).BundleTask; + + +var FILE = require("file"); require(FILE.absolute("../common.jake")); -$ENVIRONMENT_PRODUCT = FILE.join($ENVIRONMENT_FRAMEWORKS_DIR, "Foundation"); $BUILD_PATH = FILE.join($BUILD_DIR, $CONFIGURATION, "Foundation"); -task ("build", ["Foundation", $ENVIRONMENT_PRODUCT]); +task ("build", ["Foundation"]); -bundle ("Foundation", function(foundationTask) +framework ("Foundation", function(foundationTask) { foundationTask.setBuildIntermediatesPath(FILE.join($BUILD_DIR, "Foundation.build", $CONFIGURATION)) foundationTask.setBuildPath(FILE.join($BUILD_DIR, $CONFIGURATION)); @@ -22,10 +20,4 @@ bundle ("Foundation", function(foundationTask) foundationTask.setResources(FILE.glob("Resources/*")); }); -// Framework in environment directory -filedir ($ENVIRONMENT_PRODUCT, ["Foundation"], function() -{ - cp_r(FILE.join($BUILD_PATH, '.'), $ENVIRONMENT_PRODUCT); -}); - //CLOBBER.include($ENVIRONMENT_PRODUCT) diff --git a/Objective-J/CommonJS/Jakefile b/Objective-J/CommonJS/Jakefile new file mode 100644 index 000000000..806ded5bd --- /dev/null +++ b/Objective-J/CommonJS/Jakefile @@ -0,0 +1,17 @@ +#!/usr/bin/env narwhal + +var FILE = require("file"); + +require("../../common.jake"); + +$COMMON_JS_PRODUCT = FILE.join($BUILD_DIR, "objective-j"); + +task ("build", [$COMMON_JS_PRODUCT]); + +filedir ($COMMON_JS_PRODUCT, FILE.glob("objective-j/**/*"), function() +{ + rm_rf($COMMON_JS_PRODUCT); + cp_r('objective-j', $COMMON_JS_PRODUCT); +}); + +//CLOBBER.include($ENVIRONMENT_OBJJ_PRODUCT) diff --git a/Objective-J/CommonJS/objective-j/lib/jake.js b/Objective-J/CommonJS/objective-j/lib/jake.js deleted file mode 100644 index f789e31a5..000000000 --- a/Objective-J/CommonJS/objective-j/lib/jake.js +++ /dev/null @@ -1,5 +0,0 @@ -throw "uh oh"; -print("wha?..."); -exports.BundleTask = require("objective-j/jake/bundletask").BundleTask; -//exports.FrameworkTask = require("objective-j/jake/frameworktask"); -//exports.ApplicationTask = require("objective-j/jake/applicationtask"); \ No newline at end of file diff --git a/Objective-J/CommonJS/objective-j/lib/objective-j/jake.js b/Objective-J/CommonJS/objective-j/lib/objective-j/jake.js new file mode 100644 index 000000000..d91f49e10 --- /dev/null +++ b/Objective-J/CommonJS/objective-j/lib/objective-j/jake.js @@ -0,0 +1,10 @@ + +var BUNDLE_TASK = require("objective-j/jake/bundletask"); + +exports.BundleTask = BUNDLE_TASK.BundleTask; +exports.bundle = BUNDLE_TASK.bundle; + +var FRAMEWORK_TASK = require("objective-j/jake/frameworktask"); + +exports.FrameworkTask = FRAMEWORK_TASK.FrameworkTask; +exports.framework = FRAMEWORK_TASK.framework; \ No newline at end of file diff --git a/Objective-J/CommonJS/objective-j/lib/jake/LICENSES/LGPL-v2.1 b/Objective-J/CommonJS/objective-j/lib/objective-j/jake/LICENSES/LGPL-v2.1 similarity index 100% rename from Objective-J/CommonJS/objective-j/lib/jake/LICENSES/LGPL-v2.1 rename to Objective-J/CommonJS/objective-j/lib/objective-j/jake/LICENSES/LGPL-v2.1 diff --git a/Objective-J/CommonJS/objective-j/lib/jake/LICENSES/MIT b/Objective-J/CommonJS/objective-j/lib/objective-j/jake/LICENSES/MIT similarity index 100% rename from Objective-J/CommonJS/objective-j/lib/jake/LICENSES/MIT rename to Objective-J/CommonJS/objective-j/lib/objective-j/jake/LICENSES/MIT diff --git a/Objective-J/CommonJS/objective-j/lib/jake/bundletask.js b/Objective-J/CommonJS/objective-j/lib/objective-j/jake/bundletask.js similarity index 95% rename from Objective-J/CommonJS/objective-j/lib/jake/bundletask.js rename to Objective-J/CommonJS/objective-j/lib/objective-j/jake/bundletask.js index e8b10fed2..a3d150b1a 100644 --- a/Objective-J/CommonJS/objective-j/lib/jake/bundletask.js +++ b/Objective-J/CommonJS/objective-j/lib/objective-j/jake/bundletask.js @@ -105,19 +105,19 @@ BundleTask.defineTask = function(/*String*/ aName, /*Function*/ aFunction) BundleTask.Platform = { "ObjJ" : "ObjJ", - "Rhino" : "Rhino", + "CommonJS" : "CommonJS", "Browser" : "Browser" }; BundleTask.PLATFORM_DIRECTORIES = { "ObjJ" : "objj.platform", - "Rhino" : "rhino.platform", + "CommonJS" : "commonjs.platform", "Browser" : "browser.platform" }; BundleTask.PLATFORM_DEFAULT_FLAGS = { "ObjJ" : [], - "Rhino" : ['-DPLATFORM_RHINO'], + "CommonJS" : ['-DPLATFORM_RHINO -DPLATFORM_COMMONJS'], "Browser" : ['-DPLATFORM_BROWSER', '-DPLATFORM_DOM'] }; @@ -321,7 +321,7 @@ var LICENSES_PATH = FILE.join(FILE.absolute(FILE.dirname(module.path)), "LICEN "LGPL_v2_1" : FILE.join(LICENSES_PATH, "LGPL-v2.1"), "MIT" : FILE.join(LICENSES_PATH, "MIT") }; -print(LICENSE_PATHS.LGPL_v2_1); + BundleTask.prototype.defineLicenseTask = function() { var license = this.license(); @@ -405,7 +405,7 @@ BundleTask.prototype.resourcesPath = function() BundleTask.prototype.defineResourceTask = function(aResourcePath, aDestinationPath) { - var extname = FILE.extname(aResourcePath); + var extname = FILE.extension(aResourcePath); // NOT: // (extname === ".cib" && (FILE.exists(extensionless + '.xib') || FILE.exists(extensionless + '.nib')) || @@ -447,9 +447,9 @@ BundleTask.prototype.defineResourceTasks = function() if (FILE.isDirectory(aResourcePath)) { - FILE.glob(aPath + "/**/*").forEach(function(aSubresourcePath) + FILE.glob(aResourcePath + "/**").forEach(function(aSubresourcePath) { - this.defineResourceTask(resourcePath, FILE.join(resourcesPath, aSubresourcePath.substring(aSubresourcePath.length - baselength))); + this.defineResourceTask(aSubresourcePath, FILE.join(resourcesPath, aSubresourcePath.substring(aResourcePath.length - baselength))); }, this); } else @@ -495,7 +495,8 @@ BundleTask.prototype.defineSourceTasks = function() { var platformSources = sources, platformBuildIntermediatesPath = FILE.join(this.buildIntermediatesProductPath(), BundleTask.PLATFORM_DIRECTORIES[aPlatform]), - staticPath = this.buildProductStaticPathForPlatform(aPlatform); + staticPath = this.buildProductStaticPathForPlatform(aPlatform), + flags = BundleTask.PLATFORM_DEFAULT_FLAGS[aPlatform]; if (!Array.isArray(platformSources)) platformSources = platformSources[aPlatform]; @@ -503,14 +504,14 @@ BundleTask.prototype.defineSourceTasks = function() platformSources.forEach(function(/*String*/ aFilename) { // if this file doesn't exist or isn't a .j file, don't preprocess it. - if (!FILE.exists(aFilename) || FILE.extname(aFilename) !== '.j') + if (!FILE.exists(aFilename) || FILE.extension(aFilename) !== '.j') return; var compiledPlatformSource = FILE.join(platformBuildIntermediatesPath, FILE.basename(aFilename)); filedir (compiledPlatformSource, [aFilename], function() - { - objjc.preprocess(aFilename, compiledPlatformSource); + {//#{flags.join(' ')} #{PLATFORM_FLAGS[platform].join(' ')} + objjc.preprocess(aFilename, compiledPlatformSource, flags); }); filedir (staticPath, [compiledPlatformSource]); diff --git a/Objective-J/CommonJS/objective-j/lib/jake/frameworktask.js b/Objective-J/CommonJS/objective-j/lib/objective-j/jake/frameworktask.js similarity index 56% rename from Objective-J/CommonJS/objective-j/lib/jake/frameworktask.js rename to Objective-J/CommonJS/objective-j/lib/objective-j/jake/frameworktask.js index f996cae24..f1fd557dc 100644 --- a/Objective-J/CommonJS/objective-j/lib/jake/frameworktask.js +++ b/Objective-J/CommonJS/objective-j/lib/objective-j/jake/frameworktask.js @@ -1,13 +1,13 @@ -BundleTask = require("objective-j/bundletask").BundleTask; +BundleTask = require("objective-j/jake/bundletask").BundleTask; -function FrameworkTask() -{ +function FrameworkTask(aName) +{print(aName + " so far so good"); BundleTask.apply(this, arguments); } FrameworkTask.__proto__ = BundleTask; -FrameworkTask.prototype.__proto__ = BundleTask; +FrameworkTask.prototype.__proto__ = BundleTask.prototype; FrameworkTask.prototype.packageTask = function() { @@ -19,5 +19,5 @@ exports.FrameworkTask = FrameworkTask; exports.framework = function(aName, aFunction) { // No .apply necessary because the parameters aren't variable. - return Framework.defineTask(aName, aFunction); + return FrameworkTask.defineTask(aName, aFunction); } \ No newline at end of file diff --git a/Objective-J/Jakefile b/Objective-J/Jakefile index 84b2a95d9..3b2beec33 100644 --- a/Objective-J/Jakefile +++ b/Objective-J/Jakefile @@ -89,7 +89,7 @@ task ("clean", ["clean_suprojects"]); task ("clobber", ["clobber_subprojects"]); -subprojects = ["Tools"]; +subprojects = ["CommonJS"]; task ("build_subprojects", function() {