Changeset 28287 for main/trunk/release-kits/shared/core

Timestamp:

2013-09-17T19:02:36+12:00 (11 years ago)

Author:

ak19

Message:

Race condition in generating wrapper.h omitted the greenstonejar array variable declaration in the file so that wrapper.cpp failed to compile. Instead of using exec tasks to echo lines into the wrapper.h file, it uses a single echo task.

File:

• main/trunk/release-kits/shared/core/ant-scripts/wrap.xml (modified) (2 diffs)

main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

@@ -98 +98 @@
 
             <else>
-              <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
+              <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true">
                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/>
               </exec>
-              <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
+              <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true">
                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
               </exec>
@@ -122 +122 @@
             <!-- creating wrapper header file -->
             <delete file="wrapper.h"/>
-            <exec executable="echo" output="wrapped-installer/wrapper.h"><arg line="extern const char greenstonejar[${greenstone.jar.size}];"/></exec>
-            <exec executable="echo" output="wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
-            <exec executable="echo" output="wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
+            <!-- ensure no tabs/whitespaces in front of each line in the .h file owing to indentation here -->
+            <echo file="wrapped-installer/wrapper.h">extern const char greenstonejar[${greenstone.jar.size}];
+extern const char java[${java.size}];
+#define java_is_bundled yes
+</echo>
 
             <!-- compile the wrapper program -->
-            <exec executable="g++" dir="wrapped-installer">
+            <exec executable="g++" dir="wrapped-installer" failonerror="true">
                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
             </exec>