Changeset 23807

Show
Ignore:
Timestamp:
24.03.2011 09:40:45 (8 years ago)
Author:
sjm84
Message:

Created a property called gli.and.gems that will prevent gems and gli from being checked out and compiled

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r23797 r23807  
    5757with.jni=true 
    5858 
     59## Controls whether or not we want GLI and GEMS to be checked out and compiled 
     60gems.and.gli=true 
     61 
    5962## Control if compilation of gs2 is static or not. Used, for example, for distributions 
    6063# Same issue as 'with.jni' for how this gets used in ant 1.7.1 and before 
  • main/trunk/greenstone3/build.xml

    r23803 r23807  
    16951695  <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present"> 
    16961696    <!-- checkout --> 
    1697     <if><bool><not><istrue value="${nosvn.mode}"/></not></bool> 
     1697    <if><bool><and><not><istrue value="${nosvn.mode}"/></not><isset property="gli.and.gems"/></and></bool> 
    16981698 
    16991699    <exec executable="svn"> 
     
    17291729  
    17301730  <target name="compile-gli" depends="init" if="collection.building.enabled"> 
    1731     <!-- gli --> 
    1732     <property name="gli.home" value="${basedir}/gli"/> 
    1733  
    1734     <!-- linux --> 
    1735     <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 
    1736     <!--remote gli--> 
    1737     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 
    1738       resolveExecutable="true" failonerror="true"/> 
    1739     <!-- windows --> 
    1740     <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 
    1741     <!--remote gli--> 
    1742     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 
    1743       resolveExecutable="true" failonerror="true"/>  
    1744     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 
     1731    <if><bool><isset property="gli.and.gems"/></bool> 
     1732      <!-- gli --> 
     1733      <property name="gli.home" value="${basedir}/gli"/> 
     1734 
     1735      <!-- linux --> 
     1736      <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 
     1737      <!--remote gli--> 
     1738      <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 
     1739        resolveExecutable="true" failonerror="true"/> 
     1740      <!-- windows --> 
     1741      <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 
     1742      <!--remote gli--> 
     1743      <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 
     1744        resolveExecutable="true" failonerror="true"/>  
     1745      <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 
     1746    </if> 
    17451747  </target> 
    17461748