Changeset 19406 for release-kits

Timestamp:

2009-05-12T16:26:33+12:00 (15 years ago)

Author:

oranfry

Message:

pass on the value of install.flax to the compiled greenstone3

Location:

release-kits/wirk3

Files:

• ant-scripts/build.xml (modified) (2 diffs)
• ant-scripts/compile.xml (modified) (3 diffs)
• bin/wirk3.exe (modified) ( previous)
• src/wirk3.cpp (modified) (1 diff)

release-kits/wirk3/ant-scripts/build.xml

@@ -33 +33 @@
     
     <!-- THE MAIN TARGET -->
-    <target name="wirk3" depends="init">
+    <target name="wirk3" depends="init,gs3-init">
         <antcall target="compile"/>
         <antcall target="create-distribution"/>
@@ -49 +49 @@
         <echo>branch.path         the branch of Greenstone3 to make a release of. Eg: tags/2.81. Default: trunk.</echo>
         <echo>branch.revision     the revision of Greenstone3 to make a release of. Eg: 18273. Default: HEAD.</echo>
+        <echo>install.flax        set to true to include flax in the distribution. Default: false.</echo>
         <echo/>
     </target>

release-kits/wirk3/ant-scripts/compile.xml

@@ -4 +4 @@
     <target name="compile">
         <antcall target="checkout-greenstone3" />
+        <antcall target="generate-build-properties"/>
+        
         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall>
         <ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
@@ -24 +26 @@
             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/>
         </svn>
+    </target>
+
+    <target name="generate-build-properties">
+        <copy file="compiled/build.properties.in" tofile="compiled/build.properties"/>
+        <if><bool><istrue value="${install.flax}"/></bool>
+            <rsr file="compiled/build.properties" pattern="^#install.flax\s*[=:].*" replacement="install.flax=true"/>
+        </if>
     </target>
 
@@ -67 +76 @@
         </exec>
     </target>
-
+    
 </project>

release-kits/wirk3/src/wirk3.cpp

@@ -65 +65 @@
     string JAVA_HOME = getenv( "JAVA_HOME" );
     string WIRK3_HOME = getenv( "WIRK3_HOME" );
+    putenv( ("ANT_HOME=" + WIRK3_HOME + "\\core\\ant").c_str() );
     //string PWD = getenv( "CD" );