Changeset 17609 for release-kits

Timestamp:

2008-10-24T16:17:28+13:00 (15 years ago)

Author:

oranfry

Message:

fixes to make mark in sync with lirk

Location:

release-kits/mark3

Files:

• ant-scripts/create-installer.xml (modified) (1 diff)
• installer/build.xml (modified) (2 diffs)

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

@@ -15 +15 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${mark3.home}/greenstone3/installer-classes"/>
-            <fileset file="${basedir}/distribution/greenstone3/LICENCE.txt" /> 
+            <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt" /> 
         </copy>
         <unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+
+        <unjar src="${mark3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+        <delete dir="${basedir}/installer/classes/META-INF"/>
+
     </target>
 

release-kits/mark3/installer/build.xml

@@ -26 +26 @@
         <mkdir dir="${installDir}"/>
 
-        <!-- rename greenstone3-build.xml back to build.xml -->
-        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
-    
         <!-- install files -->
         <echo message="Installing Files"/>
@@ -36 +33 @@
         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
         <delete file="core.comp"/>
+
+        <!-- rename greenstone3-build.xml back to build.xml -->
+        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
 
         <echo message="Setting Binaries to Executable"/>