Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

two changes for issue #615 #642

Merged
merged 2 commits into from Aug 1, 2011
Merged

two changes for issue #615 #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3611b4c
issue 615 "files.bypass does not work." It was a case of unraveling w…
roblarsen Jul 31, 2011
f2f59b0
added a quick example to the file.bypass.js explanation
roblarsen Jul 31, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 14 additions & 17 deletions build/build.xml
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -548,20 +545,20 @@
<!-- 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"/>
<exclude name="${dir.js}/libs-concat.js"/>
<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>


Expand Down
3 changes: 3 additions & 0 deletions build/config/project.properties
View file
Open in desktop
Expand Up @@ -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
Expand Down