Changeset 34547

Timestamp:

2020-11-19T14:30:36+13:00 (3 years ago)

Author:

ak19

Message:

More changes to get the yaz-client checkout folder and filename correct across mac and linux

File:

• main/trunk/greenstone3/build.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -3214 +3214 @@
     <condition property="bitness.suffix" value="64" else="32">
       <matches string="${os.arch}" pattern="64"/>
+    </condition>
+    <condition property="os.folder.name" value="mac" else="linux"> <!-- checkout from dir: mac or linux -->
+      <equals arg1="${os.bin.dir}" arg2="darwin" trim="true"/>
     </condition>    
-    <mkdir dir="${gs2build.home}/bin/${os.bin.dir}"/>
+    <mkdir dir="${gs2build.home}/bin/${os.bin.dir}"/> <!-- mkdir darwin or linux -->
     <exec executable="svn" dir="${gs2build.home}/bin/${os.bin.dir}">
       <arg value="export"/>
       <arg value="-r"/><arg value="${branch.revision}"/>
-      <arg value="${svn.root}/main/${branch.path}/binaries/${os.bin.dir}/yaz/yaz-client-${os.bin.dir}-x${bitness.suffix}"/>
+      <arg value="${svn.root}/main/${branch.path}/binaries/${os.folder.name}/yaz/yaz-client-x${bitness.suffix}"/> <!-- checkout from dir: mac or linux -->
       <arg value="yaz-client"/>
     </exec>