Changeset 1542

Timestamp:

11/17/20 16:27:50 (3 years ago)

Author:

davidb

Message:

Change in how the Expeditee.jar file is formed to avoid the extremely expensive fileIO that zipfileset triggers

File:

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

trunk/build.xml

@@ -26 +26 @@
         <property name="expeditee.server.port" value="3000"/>
 
-        <union id="portable.includes.exp">
+        <!--
+            The following approach turned out to be terribly slow as the number of
+            jar files incluced increase.  This is because the 'zipfileset' task functions
+            by using a separate file IO pass for each file extraced.  For more details
+            see:
+            
+              https://bz.apache.org/bugzilla/show_bug.cgi?id=43144
+            
+            which also highlights how the unzip task can be used to write a faster alternative,
+            which (imprinted to the same 'exludes' pattern specified here) is used in
+            the 'mergejars' target below
+        -->
+        
+        <union id="reallyslowIO.portable.includes.exp">
                 <zipfileset excludes="META-INF/*.SF" src="releases/jars/junit.jar"/>
                 <zipfileset excludes="META-INF/*.SF" src="releases/jars/activation.jar"/>
@@ -57 +70 @@
                 </fileset>
         </path>
-        
+
         <path id="classpath.jfx">
-                <!-- Check this points to an existing file, if you can't find the jar just compile with build-nojfx -->
-                <pathelement location="${java.home}/lib/jfxrt.jar"/>
+          <!-- Check this points to an existing file, if you can't find the jar just compile with build-nojfx -->
+          <pathelement location="${java.home}/lib/jfxrt.jar"/>
+        </path>
+
+
+        <path id="portable.includes.exp">
+          <fileset dir="${dist.dir.exp}/unjarred">
+          </fileset>
         </path>
 
@@ -155 +174 @@
                 </jar>
         </target>
-        <target depends="build" name="jar"> <!-- self-contained, portable jar -->
+        <target depends="build" name="reallyslowIO.jar"> <!-- self-contained, portable jar -->
                 <jar destfile="${dist.dir.exp}/${dist.filename.exp}" filesetmanifest="mergewithoutmain">
                         <manifest>
@@ -164 +183 @@
                                 <exclude name="src/**"/>
                         </fileset>
+                        <resources refid="reallyslowIO.portable.includes.exp" />   
+                </jar>
+        </target>
+
+        
+        <target name="mergejars">
+          <unzip dest="${dist.dir.exp}/unjarred">
+            <patternset>
+              <exclude name="META-INF/*.SF"/>
+            </patternset>
+            <!-- fileset to include ... -->
+            <path refid="classpath.exp"/>
+          </unzip>
+        </target>
+
+
+        <target depends="build,mergejars" name="jar"> <!-- self-contained, portable jar -->
+                <jar destfile="${dist.dir.exp}/${dist.filename.exp}" filesetmanifest="mergewithoutmain">
+                        <manifest>
+                                <attribute name="Main-Class" value="org.apollo.ApolloSystem"/>
+                                <attribute name="Class-Path" value="."/>
+                        </manifest>
+                        <fileset dir="${build.dir.exp}">
+                                <exclude name="src/**"/>
+                        </fileset>
                         <resources refid="portable.includes.exp" />
                 </jar>
-        </target>
+                <delete dir="${dist.dir.exp}/unjarred" quiet="true"/>
+        </target>
+
+
         <target depends="jar" name="inst">
                 <mkdir dir="${inst.dir.exp}" />