From 3611b4c4e0492415408edbc44a2915eb7a3f71ef Mon Sep 17 00:00:00 2001
From: Rob Larsen <rob@drunkenfist.com>
Date: Sun, 31 Jul 2011 09:12:28 -0400
Subject: [PATCH 1/2] issue 615 "files.bypass does not work." It was a case of
 unraveling where/when the scripts were getting copied over and changing the
 way, slightly, that the excluded file list was fed to the script.

---
 build/build.xml | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 53b455fec8..980a77051c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -480,18 +480,16 @@
         </concat>
     </target>
     
-    
     <target name="-js.mylibs.concat" depends="-js.all.minify" description="(PRIVATE) Concatenates the JS files in dir.js.mylibs">
         <mkdir dir="./${dir.intermediate}/${dir.js.mylibs}"/>
 
         <echo message="Concatenating JS libraries"/>
         <!-- overwrite=no here means not to overwrite if the target is newer than the sources -->
         <concat destfile="./${dir.intermediate}/${dir.js}/libs-concat.js" overwrite="no">
-            <fileset dir="./${dir.intermediate}/${dir.js.mylibs}/">
-                <include name="**/*.js"/>
-                <exclude name="${file.default.js.bypass}"/>
-                <exclude name="${file.js.bypass}"/>                
-            </fileset>      
+            <fileset dir="./${dir.intermediate}/${dir.js.mylibs}/"
+				includes="**/*.js" 
+				excludes="${file.js.bypass}"/>                
+                  
         </concat>
     </target>
     
@@ -523,15 +521,14 @@
     <target name="-js.all.minify" depends="-mkdirs" description="(PRIVATE) Minifies the scripts.js files created by js.scripts.concat">
         <echo message="Minifying scripts"/>
         <copy todir="${dir.intermediate}/">
-            <fileset dir="${dir.source}/" includes="${dir.js}/**/*.min.js, ${dir.js.mylibs}/${file.default.js.bypass}, ${dir.js.mylibs}/${file.js.bypass}"/>
+            <fileset dir="${dir.source}/" includes="${dir.js}/**/*.min.js"  />
         </copy>
         <apply executable="java" parallel="false">
-            <fileset dir="${dir.source}/">
+            <fileset dir="${dir.source}/" >
                 <include name="${dir.js}/**/*.js"/>
                 <exclude name="${dir.js}/**/*.min.js"/>
-                <exclude name="${dir.js.mylibs}/${file.default.js.bypass}"/>
-                <exclude name="${dir.js.mylibs}/${file.js.bypass}"/>                
-                <!-- minifying these is unnecessary, and will cause them to include themselves on the next build -->
+				<exclude name="${dir.js.mylibs}/**/*.js"/>
+				<!-- minifying these is unnecessary, and will cause them to include themselves on the next build -->
                 <!--<exclude name="scripts-concat.js"/>-->
                 <!--<exclude name="libs-concat.js"/>-->
             </fileset>
@@ -548,7 +545,7 @@
         <!-- at this point all js files are minified with their original names -->
 
         <copy todir="${dir.publish}/">
-          <fileset dir="${dir.intermediate}/">
+		  <fileset dir="${dir.intermediate}/">
               <include name="${dir.js}/**/*.js"/>
               <exclude name="${dir.js.mylibs}/**/*.js"/>
               <exclude name="${dir.js}/scripts-concat.js"/>
@@ -556,12 +553,12 @@
               <exclude name="${dir.js}/scripts-concat.min.js"/>
               <exclude name="${dir.js}/plugins.js"/>
               <exclude name="${dir.js}/script.js"/>
-          </fileset>
-          <fileset dir="${dir.intermediate}/">
-            <include name="${dir.js.mylibs}/${file.default.js.bypass}"/>                                                
-            <include name="${dir.js.mylibs}/${file.js.bypass}"/>                                              
-          </fileset>
+          </fileset>                                   
         </copy>
+		<copy todir="${dir.publish}/${dir.js.mylibs}/">
+            <fileset dir="${dir.source}/${dir.js.mylibs}/"
+		  	includes="${file.js.bypass}"/>           
+		</copy>
     </target>
     
     

From f2f59b04ecb6950a6834ac320c3e74e3da5900da Mon Sep 17 00:00:00 2001
From: Rob Larsen <rob@drunkenfist.com>
Date: Sun, 31 Jul 2011 19:44:10 -0400
Subject: [PATCH 2/2] added a quick example to the file.bypass.js explanation

---
 build/config/project.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/config/project.properties b/build/config/project.properties
index 2d3846c42c..070b98e740 100644
--- a/build/config/project.properties
+++ b/build/config/project.properties
@@ -40,8 +40,11 @@ file.exclude      =
 # comma separated list
 # These files will not be concatinated or minimized and will simply be copied over as is.
 # Note: you cannot declare an empty file.bypass property, it would exclude the entire mylibs folder
+# Example:
+# file.js.bypass = widgets.js, gadgets.js, gidgets.js
 # file.js.bypass
 
+
 # Specify an environment to build
 #
 # By Default, it builds a production environment