You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/12/02 23:33:54 UTC
svn commit: r886329 - in
/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo: build-dojo.xml
pom.xml
Author: lresende
Date: Wed Dec 2 22:33:53 2009
New Revision: 886329
URL: http://svn.apache.org/viewvc?rev=886329&view=rev
Log:
Couple more updates to the script that install dojo into the web-javascript-dojo module
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
Modified: tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml?rev=886329&r1=886328&r2=886329&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml Wed Dec 2 22:33:53 2009
@@ -27,16 +27,9 @@
<target name="check-dojo-installed">
<condition property="already.installed" >
- <available file="${dojo.zip}"/>
- </condition>
- <condition property="maven.suffix" value="">
- <os family="unix"/>
- </condition>
- <condition property="maven.suffix" value=".bat">
- <os family="windows"/>
+ <available file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
</condition>
</target>
-
<target name="check-dojo-unpacked">
<condition property="already.unpacked" >
@@ -47,9 +40,10 @@
<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}" unless="already.installed"/>
<mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
- <unzip src="${dojo.zip}"
+ <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"
dest="${basedir}/target/dojo-unpack-temp/"
- overwrite="false">
+ overwrite="false"
+ encoding="native-encoding">
<patternset>
<include name="dojo-release-${dojo.version}/dojo/**"/>
<exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
@@ -58,13 +52,12 @@
<exclude name="dojo-release-${dojo.version}/util/**"/>
</patternset>
</unzip>
- <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
+ <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}"
tofile="${unpack.location}"
verbose="true"/>
<delete dir="${basedir}/target/dojo-unpack-temp/"/>
</target>
-
<target name="clean-dojo-files">
<delete dir="${unpack.location}"/>
</target>
Modified: tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml?rev=886329&r1=886328&r2=886329&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml Wed Dec 2 22:33:53 2009
@@ -46,6 +46,7 @@
<groupId>org.dojotoolkit</groupId>
<artifactId>dojo</artifactId>
<version>1.3.0</version>
+ <type>zip</type>
</dependency>
<dependency>
@@ -71,20 +72,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>install-dojo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="install-dojo">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
<id>copy-dojo-files</id>
<phase>generate-resources</phase>
<goals>