Changeset 30788


Ignore:
Timestamp:
09/09/16 15:39:21 (4 years ago)
Author:
ak19
Message:

More experimenting to get release kit to compile on Gilda (El Capitan).

File:
1 edited

Legend:

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

    r30787 r30788  
    393393    <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool>
    394394      <!--<if><bool><equals arg1="${env.THIS_MACHINE}" arg2="gilda"/></bool>-->
    395       <if><bool><isset property="env.THIS_MACHINE"/></bool>
    396         <echo>@@@@## THIS MACHINE: ${env.THIS_MACHINE}</echo>
     395      <if><bool><isset property="set.ld.path"/></bool>
     396        <echo>@@@@## SET-LD-PATH property: ${set.ld.path}</echo>
    397397        <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool>
    398398          <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}&quot;"/>
     
    402402        </if>
    403403        <else>
    404           <echo>@@@@## THIS MACHINE NOT SET</echo>
     404          <echo>@@@@## SET-LD-PATH property NOT SET</echo>
    405405          <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${env.DYLD_LIBRARY_PATH}&quot;"/>
    406406        </else>
     
    709709  <target name="install-common-src" depends="init"
    710710    description="Install (configure, compile, install) only the common-src package (shared code from Greenstone 2). " >
    711     <antcall target="configure-common-src"/>
    712     <antcall target="compile-common-src"/>
     711    <antcall target="configure-common-src">
     712      <param name="set.ld.path" value="true"/>
     713    </antcall>
     714    <antcall target="compile-common-src">
     715      <param name="set.ld.path" value="true"/>
     716    </antcall>
    713717    <antcall target="install-auxiliary-jar-files"/>
    714718    <antcall target="install-jni-files"/>
Note: See TracChangeset for help on using the changeset viewer.