Changeset 16633 for release-kits/wirk2/ant-scripts

Timestamp:

2008-08-01T15:42:20+12:00 (16 years ago)

Author:

oranfry

Message:

changes afer splitting gsdl into common, build and runtime

Location:

release-kits/wirk2/ant-scripts

Files:

• compile.xml (modified) (2 diffs)
• create-distribution.xml (modified) (1 diff)
• create-installer.xml (modified) (1 diff)
• wrap.xml (modified) (3 diffs)

release-kits/wirk2/ant-scripts/compile.xml

@@ -25 +25 @@
     <target name="set-version-numbers">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
+            <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
             <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
             <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
@@ -33 +33 @@
     <target name="unzip-packages">
         <if><bool><istrue value="${execute}"/></bool>
-            <unzip src="${basedir}/gsdl/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/packages/windows/crypt"/>
-            <unzip src="${basedir}/gsdl/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/packages/windows/expat"/>
-            <unzip src="${basedir}/gsdl/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/packages/windows/gdbm"/>
-            <unzip src="${basedir}/gsdl/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/packages/windows/stlport"/>
+            <unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
+            <unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
+            <unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
+            <unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
         </if>   
     </target>

release-kits/wirk2/ant-scripts/create-distribution.xml

@@ -30 +30 @@
             
             <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
-            <rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+            <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
             
             <echo level="info">Setting version in etc/VERSION</echo>

release-kits/wirk2/ant-scripts/create-installer.xml

@@ -11 +11 @@
             
             <mkdir dir="${basedir}/installer/classes"/>
-            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml"/>
-            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml"/>
-            <copy todir="${basedir}/installer/classes">
+            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
+            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml" overwrite="true"/>
+            <copy todir="${basedir}/installer/classes" overwrite="true">
                 <fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
                 <fileset dir="${wirk2.home}/windows/installer-classes"/>

release-kits/wirk2/ant-scripts/wrap.xml

@@ -18 +18 @@
             
             <!-- copy source files -->
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/>
         
         </if>
@@ -60 +60 @@
                 
                 <echo>copying the small resource files into place</echo>
-                <copy todir="${basedir}/wrapped-installer/build">
+                <copy todir="${basedir}/wrapped-installer/build" overwrite="true">
                     <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
                     <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
@@ -82 +82 @@
                 
                 <echo>making a copy of the resource script</echo>
-                <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/>
+                <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/>
                 
                 <echo>adding ${windows-java.installer} to the copy as chunks</echo>