Changeset 23809 for main

Timestamp:

2011-03-24T10:11:03+13:00 (13 years ago)

Author:

sjm84

Message:

More fixes to allow the disabling of GLI

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (4 diffs)
• resources/xml/components.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -2024 +2024 @@
 <!-- ========== Some distribution targets ======================== -->
   <target name="remove-source">
+    <if><bool><isset property="with.gli.and.gems"/></bool>
     <delete includeEmptyDirs="true">
       <fileset dir="." defaultexcludes="false">
@@ -2029 +2030 @@
      </fileset>
     </delete>
+    
+    <else>
+    <delete includeEmptyDirs="true">
+      <fileset dir="." defaultexcludes="false">
+        <patternset refid="greenstone3.source.no.gli.component"/>
+     </fileset>
+    </delete>
+    </else>
+    </if>
   </target>
 
@@ -2051 +2061 @@
     <if><bool><istrue value="${current.os.isunix}"/></bool>
       <delete><fileset dir="." includes="*.bat"/></delete>
-      <delete><fileset dir="gli" includes="*.bat"/></delete>
+      <if><bool><isset property="with.gli.and.gems"/></bool>
+    <delete><fileset dir="gli" includes="*.bat"/></delete>
+      </if>
       <delete><fileset dir="gs2build" includes="*.bat"/></delete>
       <delete><fileset dir="bin/script" includes="*.bat"/></delete>
@@ -2062 +2074 @@
     <else><if><bool><istrue value="${current.os.iswindows}"/></bool>
       <delete><fileset dir="." includes="*.sh,*.bash,*.csh"/></delete>
-      <delete><fileset dir="gli" includes="*.sh,*.bash,*.csh"/></delete>
+      <if><bool><isset property="with.gli.and.gems"/></bool>
+    <delete><fileset dir="gli" includes="*.sh,*.bash,*.csh"/></delete>
+      </if>
       <delete><fileset dir="gs2build" includes="*.sh,*.bash,*.csh"/></delete>
       <delete><fileset dir="bin/script" includes="*.sh,*.bash,*.csh"/></delete>

main/trunk/greenstone3/resources/xml/components.xml

@@ -6 +6 @@
         <include name="gli/src"/>
         <include name="gli/src/**/*"/>
+        <include name="src"/>
+        <include name="src/**/*"/>
+        <include name="gs2build/common-src"/>
+        <include name="gs2build/common-src/**/*"/>
+        <include name="gs2build/build-src"/>
+        <include name="gs2build/build-src/**/*"/>
+        <include name="gs2build/runtime-src"/>
+        <include name="gs2build/runtime-src/**/*"/>
+        <include name="gs2build/aclocal.m4"/>
+        <include name="gs2build/config.guess"/>
+        <include name="gs2build/config.h.in"/>
+        <include name="gs2build/config.sub"/>
+        <include name="gs2build/configure"/>
+        <include name="gs2build/configure.in"/>
+        <include name="gs2build/install-sh"/>
+        <include name="gs2build/Makefile.in"/>
+        <include name="gs2build/win32.mak"/>
+        <include name="gs2build/win32cfg.h"/>
+    </patternset>
+
+    <!-- source component without gli- files that get compiled and could be safely removed from a binary distribution -->
+    <patternset id="greenstone3.source.no.gli.component">
         <include name="src"/>
         <include name="src/**/*"/>