Changeset 15304

Timestamp:

2008-04-30T09:26:34+12:00 (16 years ago)

Author:

oranfry

Message:

changes to the GUI and wrapper

Location:

release-kits/lirk3

Files:

• ant-scripts/create-installer.xml (modified) (5 diffs)
• ant-scripts/init.xml (modified) (2 diffs)
• bin/lirk3 (modified) (1 diff)

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

@@ -61 +61 @@
                     antLib="${lirk3.home}/bin/ant-installer/antlib"
                     validateConfig="true"
+                    failOnError="false"
                     icons="bluecurve">
 
@@ -67 +68 @@
                 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 
-<!--
+
                 <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
                 <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
@@ -78 +79 @@
                 <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
                 <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
--->
 
             </installer>
@@ -96 +96 @@
 
                 <!-- copy all the important files into the archive to be extracted for install -->
-                <zipfileset dir="${lirk3.home}/installer/cp" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
                 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 
-<!--
                 <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
                 <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
@@ -110 +109 @@
                 <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
                 <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
--->
             </installer>
 

release-kits/lirk3/ant-scripts/init.xml

@@ -21 +21 @@
         <pathelement path="${lirk3.home}/ant-scripts/tasks/orans"/>
         <pathelement path="${lirk3.home}/bin/ant-installer/lib/ant-installer-ext.jar"/>
+        <pathelement path="${basedir}/installer/cp"/>
     </path>
 
@@ -52 +53 @@
     <property name="java.installer" value="jre_6u5_tar_gz"/>
     <property name="java.extracted" value="jre1.6.0_05"/>
-    <property name="java.min.version" value="1.5.0_00"/>
+    <property name="java.min.version" value="1.4.0_00"/>
 
 
     <!-- stuff to do before all tasks -->
     <target name="init">
+
+        <!-- verify classpath -->
+        <!--
+        <property name="cpp" refid="project.classpath"/>
+        <echo message="classpath: ${cpp}"/>
+        -->
 
         <echo level="info">CHECKING PRE-CONDITIONS</echo>

release-kits/lirk3/bin/lirk3

@@ -40 +40 @@
 
 #create the command
-toexec="$LIRK3_HOME/bin/apache-ant-1.6.5/bin/ant -f $LIRK3_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk3.home=$LIRK3_HOME"
+toexec="$LIRK3_HOME/bin/apache-ant-1.6.5/bin/ant -lib `pwd`/installer/cp -f $LIRK3_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk3.home=$LIRK3_HOME"
 
 #pass on the arguments