diff options
Diffstat (limited to '')
| -rw-r--r-- | branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml index 2ca64ded99..15444f7d39 100644 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml @@ -26,8 +26,8 @@ <target name="check-dojo-installed"> <condition property="already.installed" > - <available file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> - </condition> + <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> + </condition> <condition property="maven.suffix" value=""> <os family="unix"/> </condition> @@ -45,41 +45,41 @@ <target name="install-dojo" depends="check-dojo-installed" unless="already.installed"> <mkdir dir="${basedir}/target/dojo-download/"/> - <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}.zip" - dest="${basedir}/target/dojo-download/dojo-${dojo.version}.zip" + <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip" + dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" verbose="true" usetimestamp="true"/> <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false"> - <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-${dojo.version}.zip"/> + <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/> </exec> </target> <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed"> <mkdir dir="${basedir}/target/dojo-download/"/> - <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}.zip" - dest="${basedir}/target/dojo-download/dojo-${dojo.version}.zip" + <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip" + dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" verbose="true" usetimestamp="true"/> - <copy file="${basedir}/target/dojo-download/dojo-${dojo.version}.zip" + <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> </target> <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> - <fail message="dojo zip file not installed in local repository: ${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" unless="already.installed"/> + <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> <mkdir dir="${basedir}/target/dojo-unpack-temp/"/> - <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" + <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip" dest="${basedir}/target/dojo-unpack-temp/" overwrite="false"> <patternset> - <include name="dojo-${dojo.version}/dojo/**"/> - <exclude name="dojo-${dojo.version}/dojo/tests/**"/> - <exclude name="dojo-${dojo.version}/dijit/**"/> - <exclude name="dojo-${dojo.version}/dojox/**"/> - <exclude name="dojo-${dojo.version}/util/**"/> + <include name="dojo-release-${dojo.version}/dojo/**"/> + <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/> + <include name="dojo-release-${dojo.version}/dijit/**"/> + <exclude name="dojo-release-${dojo.version}/dojox/**"/> + <exclude name="dojo-release-${dojo.version}/util/**"/> </patternset> </unzip> - <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}" + <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}" tofile="${unpack.location}" verbose="true"/> <delete dir="${basedir}/target/dojo-unpack-temp/"/> |