Changeset 16625 for greenstone3/trunk/build.xml

Timestamp:

2008-07-31T15:42:23+12:00 (16 years ago)

Author:

davidb

Message:

Minor edits relating to common-src etc.

File:

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

greenstone3/trunk/build.xml

@@ -1307 +1307 @@
   
   <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows">  
-    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
-      dest="${gs2build.home}/packages/windows/gdbm"/>
-    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
-      dest="${gs2build.home}/packages/windows/crypt"/>
-    <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
-      dest="${gs2build.home}/packages/windows/expat"/>
+    <unzip src="${gs2build.home}/common-src/packages/windows/gdbm/gdbm.zip"
+      dest="${gs2build.home}/common-src/packages/windows/gdbm"/>
+    <unzip src="${gs2build.home}/common-src/packages/windows/crypt/crypt.zip"
+      dest="${gs2build.home}/common-src/packages/windows/crypt"/>
+    <unzip src="${gs2build.home}/common-src/packages/windows/expat/expat.zip"
+      dest="${gs2build.home}/common-src/packages/windows/expat"/>
   </target>
   
@@ -1343 +1343 @@
   <target name="install-indexer-files" depends="init" unless="indexers.present">
     <copy todir="${indexers.home}">
-      <fileset dir="${gs2build.home}/indexers" />
+      <fileset dir="${gs2build.home}/common-src/indexers" />
     </copy>
     <chmod file="${indexers.home}/configure" perm="a+x"/>
@@ -1363 +1363 @@
   </target>
   
+<<<<<<< .mine
+  <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}/common-src/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>
+  
+=======
+>>>>>>> .r16624
   <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
     <antcall target="checkout-gli"/>
@@ -1479 +1501 @@
   <target name="install-gs2build-indexers-windows" depends="init" if="collection.building.enabled.windows">
     <copy todir="${gs2build.home}/bin/windows">
-      <fileset dir="${gs2build.home}/indexers/bin">
+      <fileset dir="${gs2build.home}/common-src/indexers/bin">
     <include name="*.*"/>
       </fileset>