Changeset 16002 in josm for trunk

Timestamp:

2020-03-02T23:50:44+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18140 - refactor build

File:

• trunk/build.xml (modified) (4 diffs)

trunk/build.xml

@@ -194 +194 @@
       ** Main target that builds JOSM and checks XML against schemas
     -->
-    <target name="dist" depends="compile,create-revision,check-schemas,epsg">
+    <target name="dist" depends="compile,extract-libraries,create-revision,check-schemas,epsg">
         <echo>Revision ${version.entry.commit.revision}</echo>
         <copy file="CONTRIBUTION" todir="${build.dir}"/>
@@ -201 +201 @@
         <!-- create josm-custom.jar -->
         <delete file="${dist.jar}"/>
-        <!-- extract libraries to build dir to create uber-jar -->
-        <unzip dest="${build.dir}">
-            <fileset refid="runtime.fileset"/>
-            <patternset>
-                <exclude name="META-INF/**"/>
-                <exclude name="*"/>
-            </patternset>
-        </unzip>
         <jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
             <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
@@ -1135 +1127 @@
         <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-all-dependencies.png"/>
     </target>
-    <target name="resolve" depends="init-ivy">
+    <target name="resolve" depends="init-ivy" unless="resolve.notRequired">
         <ivy:resolve keep="true"/>
         <ivy:report todir="${tools.dir}/ivy-report" graph="false"/>
@@ -1144 +1136 @@
         <ivy:retrieve pattern="${tools.dir}/ivy/[artifact]-[type].[ext]" conf="ivy"/>
     </target>
+    <target name="extract-libraries" depends="resolve" description="extract libraries to build dir">
+        <unzip dest="${build.dir}">
+            <fileset refid="runtime.fileset"/>
+            <patternset>
+                <exclude name="META-INF/**"/>
+                <exclude name="*"/>
+            </patternset>
+        </unzip>
+    </target>
     <target name="bootstrap-workspace" description="Copy libraries from ivy cache to workspace folders for IDE" depends="resolve">
         <delete dir="${lib.dir}"/>