Changeset 12476

Timestamp:

02/15/08 21:22:15 (11 months ago)

Author:

jburke

Message:

Fixes #5855: introduces cssImportIgnore and sets up build_release.sh to do a safe css optimization that excludes dijit.css from inlining in each theme. \!strict

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (1 diff)
• build_release.sh (modified) (1 diff)
• jslib/buildUtil.js (modified) (6 diffs)

util/trunk/buildscripts/build.js

@@ -319 +319 @@
         
         if(kwArgs.cssOptimize){
-                buildUtil.optimizeCss(releasePath, kwArgs.cssOptimize);
+                buildUtil.optimizeCss(releasePath, kwArgs.cssOptimize, kwArgs.cssImportIgnore);
         }
 }

util/trunk/buildscripts/build_release.sh

@@ -61 +61 @@
 cd $buildName/util/buildscripts/
 chmod +x ./build.sh
-./build.sh profile=standard version=$1 releaseName=$buildName action=release
+./build.sh profile=standard version=$1 releaseName=$buildName cssOptimize=comments.keepLines cssImportIgnore=../dijit.css action=release
 cd ../../release/
 

util/trunk/buildscripts/jslib/buildUtil.js

@@ -66 +66 @@
                 defaultValue: "",
                 helpText: "Specifies how to optimize CSS files. If \"comments\" is specified, "
-                        + "then code comments and line returns are stripped. If \"comments.keepLines\" "        
-                        + "is specified, then code comments are stripped, but line returns are preserved."
-        },
+                        + "then code comments and line returns are stripped, and files referenced via @import "
+                        + "are inlined. If \"comments.keepLines\" "     
+                        + "is specified, then code comments are stripped and @import calls are inlined, but line returns are preserved."
+        },
+
+        "cssImportIgnore": {
+                defaultValue: "",
+                helpText: "If using cssOptimize=\"comments\", then you can force the @import inlining step "
+                        + "to ignore a set of files by using this option. The value of this option should be a comma "  
+                        + "separated list of CSS files names to ignore. The file names should match whatever strings "
+                        + "are used for the @import calls."
+        },
+
         "copyTests": {
                 defaultValue: true,
@@ -1115 +1125 @@
 }
 
-buildUtil.optimizeCss = function(/*String*/startDir, /*String*/optimizeType){
+buildUtil.optimizeCss = function(/*String*/startDir, /*String*/optimizeType, /*String?*/cssImportIgnore){
         //summmary: Optimizes CSS files in a directory.
         
         if(optimizeType.indexOf("comments") != -1){
+                //Make sure we have a delimited ignore list to make matching faster
+                if(cssImportIgnore){
+                        cssImportIgnore = cssImportIgnore + ",";
+                }
+
                 var fileList = fileUtil.getFilteredFileList(startDir, /\.css$/, true);
                 if(fileList){
@@ -1127 +1142 @@
                                 //Read in the file. Make sure we have a JS string.
                                 var originalFileContents = fileUtil.readFile(fileName);
-                                var fileContents = buildUtil.flattenCss(fileName, originalFileContents);
+                                var fileContents = buildUtil.flattenCss(fileName, originalFileContents, cssImportIgnore);
 
                                 //Do comment removal.
@@ -1146 +1161 @@
                                                 fileContents = fileContents.replace(/\{\s/g, "{");
                                                 fileContents = fileContents.replace(/\s\}/g, "}");
+                                        }else{
+                                                //Remove multiple empty lines.
+                                                fileContents = fileContents.replace(/(\r\n)+/g, "\r\n");
+                                                fileContents = fileContents.replace(/(\n)+/g, "\n");
                                         }
                                 }catch(e){
@@ -1181 +1200 @@
 }
 
-buildUtil.flattenCss = function(/*String*/fileName, /*String*/fileContents){
+buildUtil.flattenCss = function(/*String*/fileName, /*String*/fileContents, /*String?*/cssImportIgnore){
         //summary: inlines nested stylesheets that have @import calls in them.
 
@@ -1199 +1218 @@
 
                 importFileName = buildUtil.cleanCssUrlQuotes(importFileName);
+                
+                //Ignore the file import if it is part of an ignore list.
+                if(cssImportIgnore && cssImportIgnore.indexOf(importFileName + ",") != -1){
+                        return fullMatch;
+                }
+
+                //Make sure we have a unix path for the rest of the operation.
                 importFileName = importFileName.replace(buildUtil.backSlashRegExp, "/");