Changeset 17416

Timestamp:

2008-10-01T10:21:53+13:00 (16 years ago)

Author:

oranfry

Message:

a few fixups after component changes

Location:

release-kits/wirk3

Files:

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

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

@@ -26 +26 @@
         <!-- some classes from jars, unpacked to be repacked into installer -->
         <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
-        <unjar src="${wirk3.home}/ant-scripts/tasks/7-zip/7z.jar" dest="${basedir}/installer/classes"/>
         <!--<unjar src="${wirk3.home}/ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar" dest="${basedir}/installer/classes"/>
         <unjar src="${wirk3.home}/ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar" dest="${basedir}/installer/classes"/>-->
@@ -34 +33 @@
 
     <target name="compile-installer">
-        <!--<exec executable="7z.exe" dir="${basdir}/distribution"><arg line="-t7z -mx=9 greenstone3 greenstone3.lzma"/></exec>-->
 
         <installer file="${basedir}/installer/Greenstone-${version}-win32.jar"

release-kits/wirk3/installer/build.xml

@@ -18 +18 @@
     <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
     <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
-    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
 
     <!-- create a local installDir String -->
@@ -163 +162 @@
         <mkdir dir="${installDir}/packages"/>
         <copy todir="${installDir}/packages/jre">
-            <fileset dir="../@java.extracted@"/>
+            <fileset dir="../@windows-java.extracted@"/>
         </copy>
     </target>