Changeset 23807 for main/trunk

Timestamp:

2011-03-24T09:40:45+13:00 (13 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:

• build.properties.in (modified) (1 diff)
• build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.properties.in

@@ -57 +57 @@
 with.jni=true
 
+## Controls whether or not we want GLI and GEMS to be checked out and compiled
+gems.and.gli=true
+
 ## Control if compilation of gs2 is static or not. Used, for example, for distributions
 # Same issue as 'with.jni' for how this gets used in ant 1.7.1 and before

main/trunk/greenstone3/build.xml

@@ -1695 +1695 @@
   <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
     <!-- checkout -->
-    <if><bool><not><istrue value="${nosvn.mode}"/></not></bool>
+    <if><bool><and><not><istrue value="${nosvn.mode}"/></not><isset property="gli.and.gems"/></and></bool>
 
     <exec executable="svn">
@@ -1729 +1729 @@
  
   <target name="compile-gli" depends="init" if="collection.building.enabled">
-    <!-- gli -->
-    <property name="gli.home" value="${basedir}/gli"/>
-
-    <!-- linux -->
-    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/>
-    <!--remote gli-->
-    <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
-      resolveExecutable="true" failonerror="true"/>
-    <!-- windows -->
-    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/>
-    <!--remote gli-->
-    <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
-      resolveExecutable="true" failonerror="true"/> 
-    <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
+    <if><bool><isset property="gli.and.gems"/></bool>
+      <!-- gli -->
+      <property name="gli.home" value="${basedir}/gli"/>
+
+      <!-- linux -->
+      <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/>
+      <!--remote gli-->
+      <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
+        resolveExecutable="true" failonerror="true"/>
+      <!-- windows -->
+      <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/>
+      <!--remote gli-->
+      <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
+        resolveExecutable="true" failonerror="true"/> 
+      <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
+    </if>
   </target>