Changeset 21311 for main/trunk/release-kits/rk2/ant-scripts/create-installer.xml

Timestamp:

2009-12-09T15:28:16+13:00 (14 years ago)

Author:

oranfry

Message:

merging the greenstone2 release kits

File:

• main/trunk/release-kits/rk2/ant-scripts/create-installer.xml (modified) (1 diff)

main/trunk/release-kits/rk2/ant-scripts/create-installer.xml

@@ -3 +3 @@
 
     <target name="create-installer">
+        <antcall target="copy-installer-files"/>
+        <antcall target="make-installer-files-concrete"/>
+        <antcall target="compile-binary-installer"/>
+    </target>
+
+    <target name="copy-installer-files" depends="copy-main-installer-files,copy-greenstone2-installer-files">
+
+        <copy todir="installer/classes" overwrite="true" file="distributions/web/LICENSE.txt"/>
+        <unjar src="${rk2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="installer/classes"/>
+        <unjar src="${rk2.home}/core/lib/crypt.jar" dest="installer/classes"/>
+
         <!-- windows -->
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+            <fileset dir="${rk2.home}/windows/7za" includes="7za.exe"/>
+        <!-- linux and mac -->
+        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+            <unjar src="${rk2.home}/core/ant-tasks/7z-ant/7z.jar" dest="installer/classes"/>
+        </if></else></if>
 
-        <!-- linux -->
-        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
-
-        <!-- mac -->
-        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-
-        </if></else></if></else></if>
-
+        <delete dir="installer/classes/META-INF"/>
     </target>