Changeset 19975 for greenstone3

Timestamp:

2009-07-09T10:10:16+12:00 (15 years ago)

Author:

oranfry

Message:

changed the source-fileset file to a file for all components, and made some updates to reflect this

Location:

greenstone3/trunk

Files:

• build.xml (modified) (2 diffs)
• resources/xml/components.xml (moved) (moved from greenstone3/trunk/resources/xml/source-fileset.xml ) (2 diffs)

greenstone3/trunk/build.xml

@@ -73 +73 @@
 
   <!-- get the fileset defining what is sourcecode -->
-  <import file="resources/xml/source-fileset.xml"/>
+  <import file="resources/xml/components.xml"/>
     
   <!-- version properties for external packages -->
@@ -1645 +1645 @@
 
   <target name="remove-source">
-    <delete includeEmptyDirs="true"><fileset dir="." defaultexcludes="false"><patternset refid="greenstone3.source.fileset"/></fileset></delete>
+    <delete includeEmptyDirs="true">
+      <fileset dir="." defaultexcludes="false">
+        <patternset refid="greenstone3.source.component"/>
+     </fileset>
+    </delete>
   </target>
 

greenstone3/trunk/resources/xml/components.xml

@@ -1 @@
-<project name="source-fileset">
-    <!-- the authoritative fileset representing the source files of a greenstone3 installation -->
-    <patternset id="greenstone3.source.fileset">
+<!-- an ant project containing authoritative definitions of the components of greenstone3 -->
+<project name="components">
+
+    <!-- source component - files that get compiled and could be safely removed from a binary distribution -->
+    <patternset id="greenstone3.source.component">
         <include name="src"/>
         <include name="src/**/*"/>
@@ -24 +26 @@
         <include name="gs2build/win32cfg.h"/>
     </patternset>
+
+    <!-- imagemagick -->
+    <patternset id="greenstone3.imagemagick.component">
+        <include name="gs2build/bin/**/imagemagick"/>
+                <include name="gs2build/bin/**/imagemagick/**/*"/>
+    </patternset>
+
+        <!-- ghostscript -->
+        <patternset id="greenstone3.ghostscript.component">
+                <include name="gs2build/bin/**/ghostscript"/>
+                <include name="gs2build/bin/**/ghostscript/**/*"/>
+        </patternset>
+
+        <!-- ant -->
+        <patternset id="greenstone3.ant.component">
+                <include name="packages/ant"/>
+                <include name="packages/ant/**/*"/>
+        </patternset>
+
+        <!-- tomcat -->
+        <patternset id="greenstone3.tomcat.component">
+                <include name="packages/tomcat"/>
+                <include name="packages/tomcat/**/*"/>
+        </patternset>
+
+        <!-- all components - invert this set to get the core component -->
+        <patternset id="greenstone3.all.component">
+        <invert>
+            <patternset refid="greenstone3.source.component"/>
+            <patternset refid="greenstone3.imagemagick.component"/>
+            <patternset refid="greenstone3.ghostscript.component"/>
+            <patternset refid="greenstone3.ant.component"/>
+            <patternset refid="greenstone3.tomcat.component"/>
+        </invert>
+        </patternset>
+
 </project>