Changeset 16620 for greenstone3/trunk/build.xml

Timestamp:

2008-07-31T14:36:47+12:00 (16 years ago)

Author:

oranfry

Message:

no need to rename gs2build-extra files as we no longer use gs2build-extra

File:

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

greenstone3/trunk/build.xml

@@ -1348 +1348 @@
   </target>
 
-  <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows,gs2build-edit-setup-bat" if="collection.building.enabled"/>
+  <target name="rename-gs2build-files" depends="gs2build-edit-setup-bat" if="collection.building.enabled"/>
   
   <target name="gs2build-edit-setup-bat" if="collection.building.enabled.windows">
@@ -1357 +1357 @@
     <move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/setup-tmp.bat">
       <filterset>
-    <filter token="gsdlhome" value="${gs2build.home.windows}"/>
+        <filter token="gsdlhome" value="${gs2build.home.windows}"/>
       </filterset>
     </move>  
     <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" />
-  </target>
-  
-  <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows">
-    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
-    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/src/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"/>
-  </target> 
-  
-  <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix">
-    <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"/>
-    <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/>
-    <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/>  
-    <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/>
-    <chmod file="${gs2build.home}/packages/configure" perm="a+x"/>
-    <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/>
-    <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/src/lib/Makefile.in"/>  
   </target>