Changeset 14984

Timestamp:

2008-02-13T16:03:55+13:00 (16 years ago)

Author:

oranfry

Message:

use the (hopefully) safer method of ls -l instead of du -b to get the size of the installer jar

File:

• release-kits/lirk3/ant-scripts/wrap.xml (modified) (1 diff)

release-kits/lirk3/ant-scripts/wrap.xml

@@ -41 +41 @@
 
             <!-- greenstone.jar -->
-            <exec executable="du" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.du">
-                <arg line="-b greenstone3.jar"/>
+            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls">
+                <arg line="-l greenstone3.jar"/>
             </exec>
-            <exec executable="sed" inputstring="${greenstone3.jar.du}" outputproperty="greenstone3.jar.size">
-                <arg line="s/[^0-9].*//g"/>
+            <!--<echo level="info">ls: ${greenstone3.jar.ls}</echo>-->
+            <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size">
+                <arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/>
             </exec>
+            <!--<echo level="info">size: ${greenstone3.jar.size}</echo>-->
             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h">
                 <arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/>
             </exec>
-
 
             <echo level="info">compile the wrapper program</echo>