You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by gr...@apache.org on 2011/05/14 12:57:07 UTC
svn commit: r1103036 - in /incubator/etch/trunk:
binding-java/runtime/build.xml compiler/build.xml util/build.xml
Author: grandyho
Date: Sat May 14 10:57:07 2011
New Revision: 1103036
URL: http://svn.apache.org/viewvc?rev=1103036&view=rev
Log:
ETCH-159 update build to work with latest Apache Ant 1.8.2
Modified:
incubator/etch/trunk/binding-java/runtime/build.xml
incubator/etch/trunk/compiler/build.xml
incubator/etch/trunk/util/build.xml
Modified: incubator/etch/trunk/binding-java/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/build.xml?rev=1103036&r1=1103035&r2=1103036&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-java/runtime/build.xml Sat May 14 10:57:07 2011
@@ -103,13 +103,6 @@
</fileset>
</jar>
- <!-- placeholder -->
- <jar jarfile="@{dist}/lib/${etch-util.jar}" update="true" filesetmanifest="merge">
- <manifest>
- <attribute name="Version" value="${Etch.version}" />
- </manifest>
- </jar>
-
<!-- CREATE source archives -->
<!-- package up etch-java-runtime src -->
Modified: incubator/etch/trunk/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/build.xml?rev=1103036&r1=1103035&r2=1103036&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/build.xml (original)
+++ incubator/etch/trunk/compiler/build.xml Sat May 14 10:57:07 2011
@@ -130,13 +130,6 @@
</fileset>
</jar>
- <!-- placeholder -->
- <jar jarfile="@{support}/lib/${etch-util.jar}" update="true" filesetmanifest="merge">
- <manifest>
- <attribute name="Version" value="${Etch.version}" />
- </manifest>
- </jar>
-
<!-- CREATE source archives -->
<!-- package up etch-compiler source -->
Modified: incubator/etch/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/build.xml?rev=1103036&r1=1103035&r2=1103036&view=diff
==============================================================================
--- incubator/etch/trunk/util/build.xml (original)
+++ incubator/etch/trunk/util/build.xml Sat May 14 10:57:07 2011
@@ -100,12 +100,6 @@
</fileset>
</jar>
- <!-- placeholder -->
- <jar jarfile="@{dist}/lib/${etch-compiler.jar}" update="true" filesetmanifest="merge">
- <manifest>
- <attribute name="Version" value="${Etch.version}" />
- </manifest>
- </jar>
<jar jarfile="@{dist}/binding-java/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge">
<manifest>
<attribute name="Version" value="${Etch.version}" />
@@ -130,53 +124,6 @@
</sequential>
</macrodef>
- <!-- MACRO: update-jars -->
- <macrodef name="update-jars" >
- <attribute name="dist" default="${Etch.dist}" />
- <attribute name="support" default="${Etch.support}" />
- <sequential>
- <!-- repackage .jar -->
- <mkdir dir="@{dist}/lib" />
- <mkdir dir="@{dist}/binding-java/lib" />
- <delete dir="${target}/tmp-compiler" quiet="true" />
- <mkdir dir="${target}/tmp-compiler" />
- <delete dir="${target}/tmp-runtime" quiet="true" />
- <mkdir dir="${target}/tmp-runtime" />
-
- <unjar src="@{support}/lib/${etch-util.jar}" dest="${target}/tmp-compiler" />
- <unjar src="@{support}/lib/${etch-compiler.jar}" dest="${target}/tmp-compiler" />
- <unjar src="@{support}/lib/${etch-util.jar}" dest="${target}/tmp-runtime" />
- <unjar src="@{support}/binding-java/lib/${etch-java-runtime.jar}" dest="${target}/tmp-runtime" />
-
- <jar jarfile="@{dist}/lib/${etch-compiler.jar}" update="true" filesetmanifest="merge" >
- <fileset dir="${target}/tmp-compiler" />
- </jar>
- <jar jarfile="@{dist}/binding-java/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge" >
- <fileset dir="${target}/tmp-runtime" />
- </jar>
-
- <!-- repackage .zip src -->
- <mkdir dir="@{dist}/lib" />
- <mkdir dir="@{dist}/binding-java/lib" />
- <delete dir="${target}/tmp-compiler-src" quiet="true" />
- <mkdir dir="${target}/tmp-compiler-src" />
- <delete dir="${target}/tmp-runtime-src" quiet="true" />
- <mkdir dir="${target}/tmp-runtime-src" />
-
- <unzip src="@{support}/lib/${etch-util-src.zip}" dest="${target}/tmp-compiler-src" />
- <unzip src="@{support}/lib/${etch-compiler-src.zip}" dest="${target}/tmp-compiler-src" />
- <unzip src="@{support}/lib/${etch-util-src.zip}" dest="${target}/tmp-runtime-src" />
- <unzip src="@{support}/binding-java/${etch-java-runtime-src.zip}" dest="${target}/tmp-runtime-src" />
-
- <zip destfile="@{dist}/lib/${etch-compiler-src.zip}" >
- <fileset dir="${target}/tmp-compiler-src" />
- </zip>
- <zip destfile="@{dist}/binding-java/${etch-java-runtime-src.zip}" >
- <fileset dir="${target}/tmp-runtime-src" />
- </zip>
-
- </sequential>
- </macrodef>
<!-- INIT TARGET -->
<!-- Modify this target to define project specific properties that can only be set at runtime -->
@@ -210,8 +157,6 @@
<!-- Bundle Jars -->
<bundle-jars dist="${Etch.support}" />
- <!-- Update Jars -->
- <update-jars dist="${Etch.dist}" support="${Etch.support}" />
</target>
<target name="compile-for-clover" if="Clover.enabled" >
@@ -237,9 +182,6 @@
<!-- Bundle Jars -->
<bundle-jars dist="${Etch.clover-support}" />
- <!-- Update Jars -->
- <update-jars dist="${Etch.clover-dist}" support="${Etch.clover-support}" />
-
</target>
<target name="do-build" depends="generate-sources,compile-for-dist,compile-for-clover" />