Add build target for bar depdendencies

blackberry-webworks · Apr 13, 2012 · 09d6703 · 09d6703
1 parent 6eaf7eb
commit 09d6703
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/Framework b/Framework
diff --git a/lib/bar-builder.js b/lib/bar-builder.js
@@ -28,6 +28,7 @@ function buildTarget(previous, baton) {
     var target = this.session.targets[targetIdx++];
     wrench.mkdirSyncRecursive(this.session.outputDir + "/" + target);
     fileManager.copyWWE(this.session, target);
+    fileManager.copyBarDependencies(this.session, target);
     nativePkgr.exec(this.session, target, this.config, function (code) {
         if (code !== 0) {
             logger.error(localize.translate("EXCEPTION_NATIVEPACKAGER"));

diff --git a/lib/bar-conf.js b/lib/bar-conf.js
@@ -20,6 +20,6 @@ self.ROOT = "";
 self.CHROME = self.ROOT + "/chrome";
 self.LIB = self.CHROME + "/lib";
 self.EXT = self.CHROME + "/ext";
-self.PLUGINS = self.CHROME + "/plugins";
+self.PLUGINS = self.ROOT + "/plugins";
 
 module.exports = self;
diff --git a/lib/conf.js b/lib/conf.js
@@ -26,6 +26,6 @@ module.exports = {
     DEPENDENCIES_TOOLS: path.normalize(__dirname + "/../dependencies/tools"),
     DEPENDENCIES_EMU: path.normalize(__dirname + "/../Framework/dependencies/BBX-Emulator"),
     DEPENDENCIES_WWE: path.normalize(__dirname + "/../dependencies/%s-wwe"),
-    DEPENDENCIES_BAR: path.normalize(__dirname + "/../dependencies/bar-dependencies"),
+    DEPENDENCIES_BAR: path.normalize(__dirname + "/../dependencies/bar-dependencies/%s"),
     DEBUG_TOKEN: path.normalize(__dirname + "/../debugtoken.bar")
 };
diff --git a/lib/file-manager.js b/lib/file-manager.js
@@ -66,13 +66,6 @@ function prepare(session) {
     // copy bootstrap
     wrench.copyDirSyncRecursive(conf.DEPENDENCIES_BOOTSTRAP, dest.CHROME);
 
-    if (!path.existsSync(dest.PLUGINS)) {
-        wrench.mkdirSyncRecursive(dest.PLUGINS, "0755");
-    }
-
-    // copy bar dependencies
-    this.copyBarDependencies(session);
-
     if (!path.existsSync(dest.LIB)) {
         wrench.mkdirSyncRecursive(dest.LIB, "0755");
     }
@@ -84,11 +77,6 @@ function prepare(session) {
     unzip(session.archivePath, session.sourceDir);
 }
 
-function copyBarDependencies(session) {
-    var conf = session.conf;
-
-    wrench.copyDirSyncRecursive(conf.DEPENDENCIES_BAR, session.sourceDir);
-}
 
 function getModulesArray(dest, files, baseDir) {
     var modulesList = [];
@@ -132,6 +120,18 @@ function copyWWE(session, target) {
     fs.copySync(src, dest);
 }
 
+function copyBarDependencies(session, target) {
+    var conf = session.conf,
+        src = path.normalize(util.format(conf.DEPENDENCIES_BAR, target)),
+        dest = path.normalize(session.sourcePaths.PLUGINS);
+
+    if (!path.existsSync(dest.PLUGINS)) {
+        wrench.mkdirSyncRecursive(dest.PLUGINS, "0755");
+    }
+
+    wrench.copyDirSyncRecursive(src, session.sourcePaths.PLUGINS);
+}
+
 function checkMissingFileInAPIFolder(apiDir, fileToCheck) {
     if (!path.existsSync(apiDir + "/" + fileToCheck)) {
         throw localize.translate("EXCEPTION_MISSING_FILE_IN_API_DIR", fileToCheck, apiDir);
@@ -190,10 +190,10 @@ module.exports = {
 
     copyWWE: copyWWE,
 
-    prepareOutputFiles: prepare,
-
     copyBarDependencies: copyBarDependencies,
 
+    prepareOutputFiles: prepare,
+
     copyExtensions: copyExtensions,
 
     generateFrameworkModulesJS: generateFrameworkModulesJS,

diff --git a/test/unit/lib/bar-builder.js b/test/unit/lib/bar-builder.js
@@ -16,6 +16,7 @@ describe("BAR builder", function () {
 
         spyOn(wrench, "mkdirSyncRecursive");
         spyOn(fileMgr, "copyWWE");
+        spyOn(fileMgr, "copyBarDependencies");
         spyOn(nativePkgr, "exec").andCallFake(function (session, target, config, callback) {
             callback(0);
         });
@@ -24,6 +25,7 @@ describe("BAR builder", function () {
 
         expect(wrench.mkdirSyncRecursive).toHaveBeenCalledWith(session.outputDir + "/" + target);
         expect(fileMgr.copyWWE).toHaveBeenCalledWith(session, target);
+        expect(fileMgr.copyBarDependencies).toHaveBeenCalledWith(session, target);
         expect(nativePkgr.exec).toHaveBeenCalledWith(session, target, config, jasmine.any(Function));
         expect(callback).toHaveBeenCalledWith(0);
     });

diff --git a/test/unit/lib/file-manager.js b/test/unit/lib/file-manager.js
@@ -11,8 +11,6 @@ var srcPath = __dirname + "/../../../lib/",
 
 describe("File manager", function () {
     it("prepareOutputFiles() should copy files and unzip archive", function () {
-        spyOn(fileMgr, "copyBarDependencies");
-
         fileMgr.prepareOutputFiles(session);
 
         expect(path.existsSync(session.sourcePaths.CHROME)).toBeTruthy();