Changeset 19948

Timestamp:

2009-06-29T15:57:11+12:00 (15 years ago)

Author:

kjdon

Message:

removed commented stuff from dist-tidy. changed the gs2build targets to build-src targets - no longer do top level clean, as we never did a top level configure so don't have the Makefiles.

File:

• greenstone3/trunk/build.xml (modified) (4 diffs)

greenstone3/trunk/build.xml

@@ -1281 +1281 @@
   </target>
 
-  <target name="clean-collection-building" depends="init,clean-gli,clean-gs2build" 
+  <target name="clean-collection-building" depends="init,clean-gli,clean-build-src" 
     description="Clean only the collection building components" 
     if="collection.building.enabled"/>
 
-  <target name="distclean-collection-building" depends="init,clean-gli,clean-gs2build,distclean-gs2build" 
+  <target name="distclean-collection-building" depends="init,clean-build-src,distclean-build-src" 
     description="Distclean only the collection building components" 
     if="collection.building.enabled"/>
@@ -1463 +1463 @@
   
  
-  <target name="clean-gs2build" depends="init" if="collection.building.enabled">
+  <target name="clean-build-src" depends="init" if="collection.building.enabled">
     <!-- unix:  -->
-    <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true">
+    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true">
       <arg value="clean"/>
     </exec>
     <!-- windows: -->    
-    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true">
+    <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true">
       <arg value="/f"/>
       <arg value="win32.mak"/>
@@ -1476 +1476 @@
   </target>
   
-
-  <target name="distclean-gs2build" depends="init,clean-gs2build" if="collection.building.enabled">
-    <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true">
+  
+  <target name="distclean-build-src" depends="init,clean-build-src" if="collection.building.enabled">
+    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true">
       <arg value="distclean"/>
     </exec>
@@ -1632 +1632 @@
     <delete file="README-SVN.txt"/>
 
-    <!-- delete some source files -->
-<!--    <delete dir="${gs2build.home}/source/src"/>
-    <delete dir="${gs2build.home}/source/lib"/>
-    <delete dir="${gs2build.home}/source/packages"/>
-    <delete dir="${gs2build.home}/source/indexers"/>-->
-
     <delete dir="${basedir}/build"/>
-    <delete dir="${basedir}/winutil"/>
     <delete dir="${basedir}/dist-resources"/>
- <!--   <delete dir="${basedir}/gs2build/source"/>-->
-
-<!--    <delete file="${basedir}/gs2build/WIN32cfg.h"/>
-    <delete file="${basedir}/gs2build/win32.mak"/>-->
-    <!-- add in linux configure/,make -->
 
     <!-- create empty directories -->