Changeset 7773

Timestamp:

03/23/07 16:45:57 (20 months ago)

Author:

jburke

Message:

Refs #2607. Got basic copying working for non-dojo dirs (like dijit). Not very interesting yet.

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (5 diffs)
• jslib/buildUtil.js (modified) (3 diffs)
• jslib/fileUtil.js (modified) (5 diffs)
• jslib/logger.js (modified) (1 diff)

util/trunk/buildscripts/build.js

@@ -12 +12 @@
 kwArgs.releaseDir = "release/" + kwArgs["releaseName"] || "dojo";
 kwArgs.version = kwArgs["version"] || "0.0.0.dev";
-kwArgs.actions = (kwArgs["action"] || "release").split(",");
+kwArgs.action = (kwArgs["action"] || "release").split(",");
 kwArgs.loader = kwArgs["loader"] || "default";
 if(!kwArgs["profileFile"] && kwArgs["profile"]){
@@ -20 +20 @@
         logger.level = logger[kwArgs["log"]];
 }
-if(typeof kwArgs["copyTests"] == "undefined")
+if(typeof kwArgs["copyTests"] == "undefined"){
         kwArgs.copyTests = true;        
 }
 
+//Execute the requested build actions
+var action = kwArgs.action;
+for(var i = 0; i < action.length; i ++){
+        this[action[i]]();
+}
+
+
 //********* Start clean ************
 function clean(){
-        fileUtil.deleteFile(releaseDir);
+        fileUtil.deleteFile(kwArgs.releaseDir);
 }
 //********* End clean *********
@@ -39 +46 @@
         //Get the list of module directories we need to process.
         //They will be in the dependencies.prefixes array.
-        var dependencies = buildUtil.evalProfile(kwArgs.profileFile);
+        var profileProperties = buildUtil.evalProfile(kwArgs.profileFile);
+        var dependencies = profileProperties.dependencies;
         var prefixes = dependencies.prefixes;
         var dojoPrefixPath = null;
+        
+        //Copy each prefix dir to the releases and
+        //operate on that copy.
         for(var i = 0; i < prefixes.length; i++){
                 var prefixName = prefixes[i][0];
@@ -50 +61 @@
                         dojoPrefixPath = prefixPath;
                 }else{
-                        _releasePrefixPath(prefixName, prefixPath, kwArgs);
+                        _prefixPathRelease(prefixName, prefixPath, kwArgs);
                 }
         }
-        
+
         //Now process Dojo core. Special things for that one.
         if(dojoPrefixPath){
@@ -73 +84 @@
 
 //********* Start _releasePrefixPath *********
-function _releasePrefixPath(prefixName, prefixPath, kwArgs){
-        //Copy prefixPath to release dir.
-        //Skip tests if requested.
-        //xxx
+function _prefixPathRelease(prefixName, prefixPath, kwArgs){
+        var releasePath = kwArgs.releaseDir + "/"  + prefixName;
+        var copyRegExp = /./;
+        
+        //Use the copyRegExp to filter out tests if requested.
+        if(kwArgs.copyTests){
+                copyRegExp = new RegExp(prefixName.replace(/\\/g, "/") + "/(?!tests/)");
+        }
+
+        fileUtil.copyDir(prefixPath, releasePath, copyRegExp);
         
         //makeDojoJs.js
         //xxx
         
+        //flatten 
         //Run xdgen if an xdomain build.
         //xxx

util/trunk/buildscripts/jslib/buildUtil.js

@@ -296 +296 @@
         //Find prefixes that are used.
         var usedPrefixes = ["dojo"];
-        usePrefixes._entries { dojo: true };
+        usedPrefixes._entries = { dojo: true };
         
         //Check normal dependencies.
@@ -303 +303 @@
         //Check layer dependencies
         var layerDeps = dependencies.layers;
-        for(var i = 0; i < layerDeps.length; i++){
-                buildUtil.addPrefixesFromDependencies(usedPrefixes, layerDeps[i].dependencies);
+        
+        if(layerDeps){
+                for(var i = 0; i < layerDeps.length; i++){
+                        buildUtil.addPrefixesFromDependencies(usedPrefixes, layerDeps[i].dependencies);
+                }
         }
 
@@ -311 +314 @@
         //location, as a sibling to dojo (and util).
         for(var i = 0; i < usedPrefixes.length; i++){
-                if(!buildUtil.isValueInArray(usedPrefixes[i], dependencies.prefixes){
+                if(!buildUtil.isValueInArray(usedPrefixes[i], dependencies.prefixes)){
                         dependencies.prefixes.push([usedPrefixes[i], "../../" + usedPrefixes[i]]);
                 }

util/trunk/buildscripts/jslib/fileUtil.js

@@ -9 +9 @@
 }
 
-//Recurses startDir and finds matches to the files that match regExpFilter.
-//Ignores files/directories that start with a period (.).
-fileUtil.getFilteredFileList = function(startDir, regExpFilter, makeUnixPaths, startDirIsJavaObject){
+fileUtil.getFilteredFileList = function(/*String*/startDir, /*RegExp*/regExpFilter, /*boolean?*/makeUnixPaths, /*boolean?*/startDirIsJavaObject){
+        //summary: Recurses startDir and finds matches to the files that match regExpFilter.
+        //Ignores files/directories that start with a period (.).
         var files = [];
 
@@ -42 +42 @@
         }
 
-        return files;
+        return files; //Array
+}
+
+
+fileUtil.copyDir = function(/*String*/srcDir, /*String*/destDir, /*RegExp*/regExpFilter){
+        //summary: copies files from srcDir to destDir using the regExpFilter to determine if the
+        //file should be copied.
+        var fileNames = fileUtil.getFilteredFileList(srcDir, regExpFilter, true);
+        
+        for(var i = 0; i < fileNames.length; i++){
+                var srcFileName = fileNames[i];
+                var destFileName = srcFileName.replace(srcDir, destDir);
+
+                logger.trace("Src filename: " + srcFileName);
+                logger.trace("Dest filename: " + destFileName);
+
+                //Make sure destination dir exists.
+                var destFile = new java.io.File(destFileName);
+                var parentDir = destFile.getParentFile();
+                if(!parentDir.exists()){
+                        if(!parentDir.mkdirs()){
+                                throw "Could not create directory: " + parentDir.getAbsolutePath();
+                        }
+                }
+
+                //Java's version of copy file.
+                var srcChannel = new java.io.FileInputStream(srcFileName).getChannel();
+                var destChannel = new java.io.FileOutputStream(destFileName).getChannel();
+                destChannel.transferFrom(srcChannel, 0, srcChannel.size());
+                srcChannel.close();
+                destChannel.close();
+        }
 }
 
 fileUtil.readFile = function(/*String*/path, /*String?*/encoding){
+        //summary: reads a file and returns a string
         encoding = encoding || "utf-8";
         var file = new java.io.File(path);
@@ -57 +89 @@
                         stringBuffer.append(lineSeparator);
                 }
-                return stringBuffer.toString();
+                return stringBuffer.toString(); //Java String
         } finally {
                 input.close();
@@ -64 +96 @@
 
 fileUtil.saveUtf8File = function(/*String*/fileName, /*String*/fileContents){
+        //summary: saves a file using UTF-8 encoding.
         fileUtil.saveFile(fileName, fileContents, "utf-8");
 }
 
 fileUtil.saveFile = function(/*String*/fileName, /*String*/fileContents, /*String?*/encoding){
+        //summary: saves a file.
         var outFile = new java.io.File(fileName);
         var outWriter;
@@ -85 +119 @@
 
 fileUtil.deleteFile = function(fileName){
+        //summary: deletes a file if it exists.
         var file = new java.io.File(fileName);
         if(file.exists()){

util/trunk/buildscripts/jslib/logger.js

@@ -32 +32 @@
 
         _print: function(message){
-                print((this.logPrefix ? this.logPrefix + " ") : "") + message);
+                print((this.logPrefix ? (this.logPrefix + " ") : "") + message);
         }
 }