diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2009-11-13 03:59:03 +0000 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2009-11-13 03:59:03 +0000 |
| commit | c868c03f98dbb64ea249e6520830f13387f90fcb (patch) | |
| tree | 71a16d1cae853bc894873a8ab002bf1d1fca2aae | |
| parent | 18e256849cad7b0d439fd044b5693bbabe3cd946 (diff) | |
| download | jquery-ui-c868c03f98dbb64ea249e6520830f13387f90fcb.tar.gz jquery-ui-c868c03f98dbb64ea249e6520830f13387f90fcb.zip | |
Ant Build: Fixed references to source files.
Fixes #4896 - Build fails on non-Windows OS.
| -rw-r--r-- | build/build.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml index f77e4046a..4b8887742 100644 --- a/build/build.xml +++ b/build/build.xml @@ -59,7 +59,8 @@ <for param="file"> <path><fileset dir="${dist.dir}/ui/minified/" includes="*.js" /></path> <sequential> - <propertyregex override="yes" property="target" input="@{file}" regexp=".+\\(.+)\.min\.js$" replace="\1"/> + <basename file="@{file}" property="target" /> + <propertyregex override="yes" property="target" input="${target}" regexp="(.+)\.min\.js$" replace="\1"/> <concat destfile="${dist.dir}/ui-headered/${target}.min.js"> <header file="${dist.dir}/headers/${target}.js" /> <fileset file="@{file}" /> @@ -86,7 +87,7 @@ <concat destfile="${dist.dir}/ui/${concatenated}.js"> <filelist dir="${src.dir}/" files="${core.files}" /> - <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" excludes="${core.files}" /> + <fileset dir="${src.dir}/" includes="jquery.ui.*.js, effects.*.js" excludes="${core.files}" /> </concat> <echo message="Concatenated built." /> @@ -115,7 +116,7 @@ <apply executable="java" parallel="false"> <filelist dir="${dist.dir}/ui/" files="${concatenated}.js" /> - <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" /> + <fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" /> <arg line="-jar" /> <arg path="${yui-jar}" /> <arg value="--charset" /> @@ -129,7 +130,7 @@ <apply executable="java" parallel="false"> <filelist dir="${dist.dir}/ui/i18n/" files="${concatenated.i18n}.js" /> - <fileset dir="${src.dir}/i18n/" includes="ui.*.js" /> + <fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" /> <arg line="-jar" /> <arg path="${yui-jar}" /> <arg value="--charset" /> @@ -151,7 +152,7 @@ </copy> <copy overwrite="true" todir="${dist.dir}/ui/"> - <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" /> + <fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" /> </copy> <copy overwrite="true" todir="${dist.dir}/ui/i18n/" > |