Changeset 10914 for trunk/gsdl3/build.xml

Timestamp:

2005-11-17T14:28:24+13:00 (18 years ago)

Author:

kjdon

Message:

undid the last change where I merged the two rename-gs2build-files targets - I knew there must have been a reason for doing it...

File:

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

trunk/gsdl3/build.xml

@@ -1348 +1348 @@
   </target>
 
-  <target name="rename-gs2build-files" depends="init">
-    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
+  <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/>
+
+  <target name="rename-gs2build-files-windows" if="current.os.iswindows">
     <!-- we want a windows path in the setup.bat file -->
     <pathconvert targetos="windows" property="gs2build.home.windows">
       <path path="${gs2build.home}"/>
     </pathconvert>
-    
-    <!-- windows versions -->
-    <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.windows}"/>
-      </filterset>
-    </copy>   
-    <!-- unix versions-->
+
+    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
+   <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.windows}"/>
+     </filterset>
+    </copy>  
+  </target> 
+  <target name="rename-gs2build-files-unix" if="current.os.isunix">
+    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
     <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>    
     <chmod file="${gs2build.home}/configure" perm="a+x"/>
@@ -1374 +1377 @@
     
   </target>
-
   <target name="prepare-gli" depends="init" if="gsdl2.islocal" unless="gli.present">
     <antcall target="checkout-gli"/>