From 7d77ec792627b6b5bfd2514cd92432527edbea1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Mon, 16 May 2011 09:38:49 +0000
Subject: [PATCH] - updated buildfile for better release
---
plugins/android/README.TXT | 2 ++
plugins/android/build.xml | 44 ++++++++++++++++----------------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/plugins/android/README.TXT b/plugins/android/README.TXT
index f3981daf..3fa01aef 100644
--- a/plugins/android/README.TXT
+++ b/plugins/android/README.TXT
@@ -48,6 +48,8 @@ HOW TO GENERATE
$ ant compileall ==> compile the strict necessary
$ ant jar ==> generate the microalign.jar library
$ ant zip ==> gerenate the malign.zip file with necessary jars
+$ ant testindep ==> recompile the sources in isolation for testing independence
+$ ant clean ==> restore the initial state of this directory
HOW TO USE
----------
diff --git a/plugins/android/build.xml b/plugins/android/build.xml
index e6cc8991..ba24f084 100644
--- a/plugins/android/build.xml
+++ b/plugins/android/build.xml
@@ -88,6 +88,23 @@
<filter token="VERS" value="${version}"/>
</target>
+ <target name="testindep" depends="init">
+ <echo message="Testing ..."/>
+ <antcall target="clean"/>
+ <!-- copy to src only what is necessary -->
+ <copy todir="src">
+ <fileset refid="musrc"/>
+ </copy>
+ <!-- compile all with the restricted path -->
+ <mkdir dir="classes"/>
+ <property name="javacargs" value="-deprecation" />
+ <javac deprecation="yes" nowarn="no" verbose="no" srcdir="src" destdir="classes" encoding="iso8859-15">
+ <compilerarg value="${javacargs}"/>
+ <classpath refid="classpath"/>
+ </javac>
+ <antcall target="clean"/>
+ </target>
+
<!-- tested -->
<!-- JEoid: not even sure it is necessary to recompile
the otherway would be to select these files from classes and to do
@@ -132,25 +149,7 @@
<delete>
<fileset dir="." includes="classes/**/*.class"/>
</delete>
- <antcall target="cleanjar"/>
- <antcall target="jar"/>
- </target>
-
- <target name="testindep" depends="init">
- <echo message="Testing ..."/>
- <antcall target="clean"/>
- <!-- copy to src only what is necessary -->
- <copy todir="src">
- <fileset refid="musrc"/>
- </copy>
- <!-- compile all with the restricted path -->
- <mkdir dir="classes"/>
- <property name="javacargs" value="-deprecation" />
- <javac deprecation="yes" nowarn="no" verbose="no" srcdir="src" destdir="classes" encoding="iso8859-15">
- <compilerarg value="${javacargs}"/>
- <classpath refid="classpath"/>
- </javac>
- <antcall target="clean"/>
+ <antcall target="compile"/>
</target>
<!-- tested -->
@@ -175,6 +174,7 @@
<fileset dir="classes" includes="fr/**/*.class"/>
<fileset dir="classes" includes="LICENSE.TXT"/>
</jar>
+ <delete dir="classes" />
</target>
<!-- tested -->
@@ -187,12 +187,6 @@
</zip>
</target>
- <!-- tested -->
- <target name="cleanjar" depends="init">
- <echo message="Erasing..."/>
- <delete file="lib/microalign.jar"/>
- </target>
-
<!-- tested -->
<target name="clean">
<echo message="Cleaning..."/>
--
GitLab