From 98e1728f08feafb739839800f414092c476eb4e0 Mon Sep 17 00:00:00 2001
From: "Norbraten, Terry" <tdnorbra@nps.edu>
Date: Thu, 29 Nov 2018 13:30:31 -0800
Subject: [PATCH] use ant props
---
build.xml | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/build.xml b/build.xml
index 9855da3..70dec7c 100644
--- a/build.xml
+++ b/build.xml
@@ -72,28 +72,25 @@
-->
<target name="-post-jar">
<property name="store.jar.name" value="LiFiBenchmarkFat"/>
- <property name="store.dir" value="dist"/>
- <property name="store.jar" value="${store.dir}/${store.jar.name}.jar"/>
+ <property name="store.jar" value="${dist.dir}/${store.jar.name}.jar"/>
<echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>
- <!--<delete dir="${store.dir}"/>
- <mkdir dir="${store.dir}"/> -->
- <jar destfile="${store.dir}/temp_final.jar" filesetmanifest="skip">
- <zipgroupfileset dir="dist" includes="*.jar"/>
- <zipgroupfileset dir="dist/lib" includes="*.jar"/>
+ <!--mkdir dir="${dist.dir}/lib-->
+ <jar destfile="${dist.dir}/temp_final.jar" filesetmanifest="skip">
+ <zipgroupfileset dir="${dist.dir}" includes="*.jar"/>
+ <zipgroupfileset dir="${dist.dir}/lib" includes="*.jar"/>
<manifest>
<attribute name="Main-Class" value="${main.class}"/>
</manifest>
</jar>
<zip destfile="${store.jar}">
- <zipfileset src="${store.dir}/temp_final.jar" excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
+ <zipfileset src="${dist.dir}/temp_final.jar" excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
</zip>
- <delete file="${store.dir}/temp_final.jar"/>
+ <delete file="${dist.dir}/temp_final.jar"/>
- <copy todir="dist" overwrite="true">
- <fileset dir="runscripts">
- </fileset>
+ <copy todir="${dist.dir}" overwrite="true">
+ <fileset dir="runscripts"/>
</copy>
- <chmod dir="dist" perm="u=rwx,go=rx" includes="**/*.sh"/>
+ <chmod dir="${dist.dir}" perm="u=rwx,go=rx" includes="**/*.sh"/>
<delete file="${dist.dir}/README.TXT"/>
<delete file="${dist.jar}"/>
<delete dir="${dist.dir}/lib"/>
--
GitLab