Changeset 9779 for branches/ant-install-branch

Timestamp:

2005-04-28T16:18:38+12:00 (19 years ago)

Author:

kjdon

Message:

more windows changes

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (7 diffs)

branches/ant-install-branch/gsdl3/build.xml

@@ -181 +181 @@
   <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
     description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
-
+  <target name="clean-windows-c++" depends="init,clean-windows-c++-gs2building,clean-windows-c++-packages"
+    description="Remove C++ compiled code for Windows. Requires Microsoft Visual Studio"/>
   <target name="compile" depends="init,compile-extra,compile-packages,compile-core,compile-gs2building"
     description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
-
+  <target name="compile-windows-c++" depends="init,compile-windows-c++-gs2building,compile-windows-c++-packages"
+    description="Compile the C/C++ code for Windows. Requires Microsoft Visual Studio"/>
   <target name="update" depends="init,update-packages,update-core,update-gs2building" 
     description="Update (thru CVS) all the source (including core, packages and gs2building) and recompile. Similar to install but doesn't reinstall components such as Tomcat and axis."/>
@@ -843 +845 @@
   </target>
 
+  <target name="clean-windows-c++-packages" depends="init" if="current.os.iswindows"
+    description="Clean only the C/C++ packages">
+    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
+      <arg value="clean"/>
+    </exec>
+    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
+      <arg value="clean"/>
+    </exec>
+  </target>   
+
   <target name="compile-packages"
     description="Compile only the packages">
@@ -899 +911 @@
   </target>
 
+  <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
+    description="Compile only the C/C++ packages">
+    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}"/>
+    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
+      <arg value="install"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+   <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}"/>
+    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
+      <arg value="install"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+  </target>   
+  
   <!-- ================== gs2building targets ===============-->
 
@@ -938 +964 @@
    </target>
  <target name="unzip-windows-packages" depends="init">  
-  <!-- unzip the windows packages -->
     <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
     dest="${gs2build.home}/packages/windows/gdbm"/>
@@ -945 +970 @@
        <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
     dest="${gs2build.home}/packages/windows/expat"/>
-   <unzip src="${gs2build.home}/packages/windows/stlport/stlport.zip"
-    dest="${gs2build.home}/packages/windows/stlport"/>
-  </target>
+   </target>
 
   <target name="rename-gs2build-files" depends="rename-gs2build-files-linux,rename-gs2build-files-windows"/>
@@ -1003 +1026 @@
     <!-- windows: -->    
   </target>
-  
+    
+  <target name="clean-windows-c++-gs2building" depends="init" if="current.os.iswindows"
+    description="remove all object files and executables">
+    <!-- run the setup script -->
+    <exec executable="${compile.windows.c++.setup}"/>
+    <exec executable="nmake" dir="${gs2build.home}">
+     <arg value="/f"/>
+     <arg value="win32.mak"/>
+     <arg value="clean"/>
+    </exec>
+  </target>  
+
   <target name="compile-gs2building" depends="init" if="gsdl2.islocal"
     description="Compile only the Greenstone 2 building components">
@@ -1021 +1055 @@
       <arg value="install"/>
     </exec>
-
+  </target>
     <!-- windows: -->
-  </target>
-  <target name="compile-gs2building-windows" depends="init" if="current.os.iswindows"
+   <target name="compile-windows-c++-gs2building" depends="init" if="current.os.iswindows"
     description="Use this if you want to compile the C++ code for the gs2build package">
+    <!-- run the setup script -->
+    <exec executable="${compile.windows.c++.setup}"/>
     <exec executable="nmake" dir="${gs2build.home}">
-      <arg value="/f"/>
-      <arg value="win32.mak"/>
-      <arg value="USE_STLPORT=1"/>
+     <arg value="/f"/>
+     <arg value="win32.mak"/>
     </exec>
   </target>