Changeset 13377

Timestamp:

2006-11-29T16:43:12+13:00 (17 years ago)

Author:

kjdon

Message:

removed some commented out stuff and install-for-dist and prepare-for-source targets which are no longer used

File:

• trunk/gsdl3/build.xml (modified) (5 diffs)

trunk/gsdl3/build.xml

@@ -301 +301 @@
 tomcat.port=${tomcat.port} 
 tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
-gsdl2.installed.path=${gsdl2.installed.path} (this is the location of Greenstone 2 if you have it)
 proxy.host=${proxy.host}
 proxy.port=${proxy.port}
@@ -1020 +1019 @@
   <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present">
     <antcall target="checkout-gs2build"/>
-    <!-- rename the .gs2build files -->
     <antcall target="rename-gs2build-files"/>
     <antcall target="unzip-windows-packages"/>
@@ -1034 +1032 @@
   
   <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows">
-<!--    <copy todir="${basedir}/bin">
-      <fileset dir="${basedir}/winbin/bin" includes="mg*.exe"/>
-    </copy>-->
-     <move todir="${gs2build.home}/bin/windows" failonerror="false">
+    <move todir="${gs2build.home}/bin/windows" failonerror="false">
       <fileset dir="${basedir}/winbin/bin"/>
     </move>
     <delete dir="${basedir}/winbin"/>
-   </target>
+  </target>
   
   <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows">  
@@ -1092 +1087 @@
     <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
     <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/>
-    <!--  <filterset>
-    <filter token="gsdlhome" value="${gs2build.home.windows}"/>
-     </filterset>
-    </copy>  -->
   </target> 
   
@@ -1260 +1251 @@
   </target>
 
-
-
-
-
-  <target name="install-for-dist" depends="accept-properties,init,configure,configure-tomcat">
-    <condition property="need.xml.jars">
-      <equals arg1="1.5" arg2="${ant.java.version}"/>
-    </condition>
-    <antcall target="rename-xml-jars"/>
-    <antcall target="rename-gs2build-files-windows"/>
-    <antcall target="deploy-localsite"/> 
-  </target>
-
-
-  <target name="prepare-for-source" depends="init,unzip-windows-packages,rename-gs2build-files-windows,prepare-tomcat,prepare-web"/>
 </project>