Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

two changes for issue #615 #642

Merged
merged 2 commits into from

2 participants

@roblarsen

The actual changes are pretty straightforward. I changed the way the bypassed files are referenced and adjusted the way in which they're copied (or not) to ./publish.

I would love to see a few other people test this just to make sure the only thing it effects is the targeted property. I've tun through it a bunch but... only on the one platform (win7 64 bit) and only with dummy content.

roblarsen added some commits
@roblarsen roblarsen issue 615 "files.bypass does not work." It was a case of unraveling w…
…here/when the scripts were getting copied over and changing the way, slightly, that the excluded file list was fed to the script.
3611b4c
@roblarsen roblarsen added a quick example to the file.bypass.js explanation f2f59b0
@paulirish paulirish merged commit 8b168ad into h5bp:master
@gigafied gigafied referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 31, 2011
  1. @roblarsen

    issue 615 "files.bypass does not work." It was a case of unraveling w…

    roblarsen authored
    …here/when the scripts were getting copied over and changing the way, slightly, that the excluded file list was fed to the script.
  2. @roblarsen
This page is out of date. Refresh to see the latest.
Showing with 17 additions and 17 deletions.
  1. +14 −17 build/build.xml
  2. +3 −0  build/config/project.properties
View
31 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>
View
3  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
Something went wrong with that request. Please try again.