Changeset 34547


Ignore:
Timestamp:
11/19/20 14:30:36 (2 weeks ago)
Author:
ak19
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r34545 r34547  
    32143214    <condition property="bitness.suffix" value="64" else="32">
    32153215      <matches string="${os.arch}" pattern="64"/>
     3216    </condition>
     3217    <condition property="os.folder.name" value="mac" else="linux"> <!-- checkout from dir: mac or linux -->
     3218      <equals arg1="${os.bin.dir}" arg2="darwin" trim="true"/>
    32163219    </condition>   
    3217     <mkdir dir="${gs2build.home}/bin/${os.bin.dir}"/>
     3220    <mkdir dir="${gs2build.home}/bin/${os.bin.dir}"/> <!-- mkdir darwin or linux -->
    32183221    <exec executable="svn" dir="${gs2build.home}/bin/${os.bin.dir}">
    32193222      <arg value="export"/>
    32203223      <arg value="-r"/><arg value="${branch.revision}"/>
    3221       <arg value="${svn.root}/main/${branch.path}/binaries/${os.bin.dir}/yaz/yaz-client-${os.bin.dir}-x${bitness.suffix}"/>
     3224      <arg value="${svn.root}/main/${branch.path}/binaries/${os.folder.name}/yaz/yaz-client-x${bitness.suffix}"/> <!-- checkout from dir: mac or linux -->
    32223225      <arg value="yaz-client"/>
    32233226    </exec>
Note: See TracChangeset for help on using the changeset viewer.