release build: Fix for #3577; also fixed min target to set correct charset (UTF-8)

This commit is contained in:
Jörn Zaefferer 2008-12-18 19:02:36 +00:00
parent b81c873338
commit 3d889451f2

View File

@ -17,11 +17,9 @@
<target name="load.properties"> <target name="load.properties">
<property file="ant.properties" /> <property file="ant.properties" />
<property name="current.version" value="1.6pre" /> <loadfile srcFile="../version.txt" property="release.version" />
<property name="release.version" value="1.6" />
<property name="release.filename" value="jquery.ui-${release.version}" /> <property name="release.filename" value="jquery.ui-${release.version}" />
<property name="dist.dir" value="dist/${release.filename}/" /> <property name="dist.dir" value="dist/${release.filename}/" />
<property name="build.dir" value="build" /> <property name="build.dir" value="build" />
<property name="ui.dir" value="../" /> <property name="ui.dir" value="../" />
@ -42,13 +40,10 @@
<target name="replace-version" depends="load.properties"> <target name="replace-version" depends="load.properties">
<replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true"> <replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true">
<fileset dir="${dist.dir}/ui/" includes="*.js"/> <fileset dir="${dist.dir}/ui/" includes="*.js"/>
<fileset dir="${dist.dir}/ui/packed/" includes="*.js"/>
<fileset dir="${dist.dir}/ui/minified/" includes="*.js"/>
</replaceregexp> </replaceregexp>
<echo message="Replaced all @VERSION to ${release.version}." /> <echo message="Replaced all @VERSION to ${release.version}." />
<replaceregexp match="${current.version}" replace="${release.version}" flags="g" byline="true">
<fileset dir="${dist.dir}/" includes="version.txt"/>
</replaceregexp>
<echo message="Update version to ${release.version} into version.txt." />
</target> </target>
<target description="Zip the package" name="zip"> <target description="Zip the package" name="zip">
@ -89,6 +84,8 @@
<fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" /> <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" />
<arg line="-jar" /> <arg line="-jar" />
<arg path="${yui-jar}" /> <arg path="${yui-jar}" />
<arg value="--charset" />
<arg value="UTF-8" />
<srcfile /> <srcfile />
<arg line="-o" /> <arg line="-o" />
<mapper type="glob" from="*.js" to="${min.folder}/*.min.js" /> <mapper type="glob" from="*.js" to="${min.folder}/*.min.js" />
@ -101,6 +98,8 @@
<fileset dir="${src.dir}/i18n/" includes="ui.*.js" /> <fileset dir="${src.dir}/i18n/" includes="ui.*.js" />
<arg line="-jar" /> <arg line="-jar" />
<arg path="${yui-jar}" /> <arg path="${yui-jar}" />
<arg value="--charset" />
<arg value="UTF-8" />
<srcfile /> <srcfile />
<arg line="-o" /> <arg line="-o" />
<mapper type="glob" from="*.js" to="${min.folder}/i18n/*.min.js" /> <mapper type="glob" from="*.js" to="${min.folder}/i18n/*.min.js" />