Changeset 9768 for branches

Timestamp:

2005-04-27T16:41:19+12:00 (19 years ago)

Author:

kjdon

Message:

more windows stuff

File:

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

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

@@ -927 +927 @@
     <antcall target="rename-gs2build-files"/>
     <antcall target="unzip-windows-packages"/>
-  </target>
+    <antcall target="get-windows-binaries"/>
+  </target>
+
+  <target name="get-windows-binaries" depends="init" if="current.os.iswindows">
+     <cvs command="checkout -P" package="winbin"/>
+     <move todir="${gs2build.home}/bin/windows" failonerror="false">
+      <fileset dir="${basedir}/winbin/bin"/>
+    </move>
+    <delete dir="${basedir}/winbin"/>
+   </target>
  <target name="unzip-windows-packages" depends="init">  
   <!-- unzip the windows packages -->
@@ -946 +955 @@
    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
    <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}"/>
+     </filterset>
+    </copy>  
   </target> 
   <target name="rename-gs2build-files-linux" if="current.os.islinux">
@@ -1016 +1029 @@
       <arg value="/f"/>
       <arg value="win32.mak"/>
+      <arg value="USE_STLPORT=1"/>
     </exec>
   </target>