Changeset 15304

Show
Ignore:
Timestamp:
30.04.2008 09:26:34 (12 years ago)
Author:
oranfry
Message:

changes to the GUI and wrapper

Location:
release-kits/lirk3
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r15205 r15304  
    6161                    antLib="${lirk3.home}/bin/ant-installer/antlib" 
    6262                    validateConfig="true" 
     63                    failOnError="false" 
    6364                    icons="bluecurve"> 
    6465 
     
    6768                <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset> 
    6869 
    69 <!-- 
     70 
    7071                <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/> 
    7172                <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset> 
     
    7879                <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset> 
    7980                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset> 
    80 --> 
    8181 
    8282            </installer> 
     
    9696 
    9797                <!-- copy all the important files into the archive to be extracted for install --> 
    98                 <zipfileset dir="${lirk3.home}/installer/cp" includes="resources/*"/> 
     98                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/> 
    9999                <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset> 
    100100 
    101 <!-- 
    102101                <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/> 
    103102                <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset> 
     
    110109                <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset> 
    111110                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset> 
    112 --> 
    113111            </installer> 
    114112 
  • release-kits/lirk3/ant-scripts/init.xml

    r15205 r15304  
    2121        <pathelement path="${lirk3.home}/ant-scripts/tasks/orans"/> 
    2222        <pathelement path="${lirk3.home}/bin/ant-installer/lib/ant-installer-ext.jar"/> 
     23        <pathelement path="${basedir}/installer/cp"/> 
    2324    </path> 
    2425 
     
    5253    <property name="java.installer" value="jre_6u5_tar_gz"/> 
    5354    <property name="java.extracted" value="jre1.6.0_05"/> 
    54     <property name="java.min.version" value="1.5.0_00"/> 
     55    <property name="java.min.version" value="1.4.0_00"/> 
    5556 
    5657 
    5758    <!-- stuff to do before all tasks --> 
    5859    <target name="init"> 
     60 
     61        <!-- verify classpath --> 
     62        <!-- 
     63        <property name="cpp" refid="project.classpath"/> 
     64        <echo message="classpath: ${cpp}"/> 
     65        --> 
    5966 
    6067        <echo level="info">CHECKING PRE-CONDITIONS</echo> 
  • release-kits/lirk3/bin/lirk3

    r15142 r15304  
    4040 
    4141#create the command 
    42 toexec="$LIRK3_HOME/bin/apache-ant-1.6.5/bin/ant -f $LIRK3_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk3.home=$LIRK3_HOME" 
     42toexec="$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" 
    4343 
    4444#pass on the arguments