Changeset 34533 for main/trunk/greenstone3/build.xml

Timestamp:

2020-11-16T10:33:50+13:00 (3 years ago)

Author:

ak19

Message:

First build.xml commit following Kathy's suggestion: ant prepare should get prebuilt (GS2 built) yaz-client and put it into the specified location. Only 64 bit yaz client committed so far. The target works, still to test whether the binary produced will conain the yaz client and whether the yaz-client works in final binary (Kathy's actually tested that in an svn version).

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -930 +930 @@
   <!-- ==================== Primary and Global Targets ============================= -->
 
-  <target name="prepare" depends="accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax"
+  <target name="prepare" depends="accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-common-src,prepare-binaries,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax"
     description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this.">
 
@@ -3209 +3209 @@
   </target>
 
+  <target name="prepare-binaries" depends="prepare-bins-linux"/>
+
+  <target name="prepare-bins-linux" depends="init" if="current.os.isunixnotmac">
+    <condition property="bitness.suffix" value="64" else="32">
+      <matches string="${os.arch}" pattern="64"/>
+    </condition>
+    <exec executable="svn" dir="${gs2build.home}/bin/linux">
+      <arg value="export"/>
+      <arg value="-r"/><arg value="${branch.revision}"/>
+      <arg value="${svn.root}/main/${branch.path}/binaries/linux/yaz/yaz-client-x${bitness.suffix}"/>
+      <arg value="yaz-client"/>
+    </exec>
+  </target>
   
   <target name="configure-packages" depends="init,configure-javagdbm"