Changeset 19901

Timestamp:

2009-06-24T14:27:00+12:00 (15 years ago)

Author:

oranfry

Message:

made the insert-windows-perl target take a todir attribute, and update calls to that target appropriately

Location:

release-kits

Files:

• shared/core/ant-scripts/init.xml (modified) (2 diffs)
• sork2/ant-scripts/build.xml (modified) (1 diff)
• wirk2/ant-scripts/compile.xml (modified) (1 diff)

release-kits/shared/core/ant-scripts/init.xml

@@ -159 +159 @@
         <dcff file="installer/build-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
 
-
-
         <installer file="installer/Greenstone-${version}-${os.suffix}.jar"
             compress="true"
@@ -399 +397 @@
     <!-- unzip windows perl into bin/windows of the given gsdl or gs2build -->
     <target name="insert-windows-perl">
-        <mkdir dir="${gsdl.basedir}/bin/windows"/>
-        <delete dir="${gsdl.basedir}/bin/windows/perl"/>
-        <unzip src="${rk.home}/windows/perl.zip" dest="${gsdl.basedir}/bin/windows"/>
+        <mkdir dir="${todir}"/>
+        <delete dir="${todir}/perl"/>
+        <unzip src="${rk.home}/windows/perl.zip" dest="${todir}"/>
     </target>
 

release-kits/sork2/ant-scripts/build.xml

@@ -29 +29 @@
         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution/gli"/></antcall>
         <antcall target="insert-winbin"/>
-        <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution"/></antcall>
+        <antcall target="insert-windows-perl"><param name="todir" value="${basedir}/distributions/Greenstone-${version}-source-distribution/bin/windows"/></antcall>
         <antcall target="tweak-files" />
         <antcall target="create-archives"/>

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

@@ -10 +10 @@
         <antcall target="unzip-packages" />
         <antcall target="get-winbin" />
-        <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="compiled"/></antcall>
+        <antcall target="insert-windows-perl"><param name="todir" value="compiled/bin/windows"/></antcall>
         <antcall target="compile-c-code" />