Changeset 15053

Show
Ignore:
Timestamp:
06.03.2008 14:08:49 (11 years ago)
Author:
oranfry
Message:

lots of work on wirk3

Location:
release-kits/wirk3
Files:
11 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/build.xml

    r15023 r15053  
    1515    <import file="compile.xml"/> 
    1616    <import file="create-distribution.xml"/> 
     17    <import file="create-launcher.xml"/> 
    1718    <import file="create-installer.xml"/> 
    18     <import file="create-launcher.xml"/> 
    1919    <import file="wrap.xml"/> 
    2020 
     
    2424        <addressedcall target="compile"/> 
    2525        <addressedcall target="create-distribution"/> 
     26        <addressedcall target="create-launcher"/> 
    2627        <addressedcall target="create-installer"/> 
    27         <addressedcall target="create-launcher"/> 
    2828        <addressedcall target="wrap"/> 
    2929    </target> 
  • release-kits/wirk3/ant-scripts/compile.xml

    r15023 r15053  
    3232        <if><bool><istrue value="${execute}"/></bool> 
    3333            <svn> 
    34                 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/> 
     34                <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3" revision="${branch.revision}"/> 
    3535            </svn> 
    3636        </if> 
     
    4545    <target name="dist-prepare-windows"> 
    4646        <if><bool><istrue value="${execute}"/></bool> 
    47             <ant dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-windows"  inheritAll="false"/> 
     47            <ant dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-windows" inheritAll="false"> 
     48                <property name="app.version" value="${version}"/> 
     49                <property name="branch.path" value="${branch.path}"/> 
     50                <property name="branch.revision" value="${branch.revision}"/> 
     51            </ant> 
     52 
    4853        </if>    
    4954    </target> 
     
    5661    <target name="dist-build-windows"> 
    5762        <if><bool><istrue value="${execute}"/></bool> 
    58             <ant dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-windows" inheritAll="false"/> 
     63            <ant dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-windows" inheritAll="false"> 
     64                <property name="app.version" value="${version}"/> 
     65                <property name="branch.path" value="${branch.path}"/> 
     66                <property name="branch.revision" value="${branch.revision}"/> 
     67            </ant> 
    5968        </if> 
    6069    </target> 
     
    6574            <mkdir dir="greenstone3/gsdl-manuals"/> 
    6675            <svn> 
    67                 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/> 
    68                 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/> 
     76                <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals" revision="${branch.revision}"/> 
     77                <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared" revision="${branch.revision}"/> 
    6978            </svn> 
    7079            <javac srcdir="greenstone3/gsdl-manuals/shared" destdir="greenstone3/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac> 
     
    98107            </exec> 
    99108             
    100  
    101109        </if> 
    102110    </target> 
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r15023 r15053  
    3737            <delete dir="distribution/greenstone3"/> 
    3838            <svn> 
    39                 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/> 
     39                <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/> 
    4040            </svn> 
    4141        </if> 
     
    6262                <property name="app.version" value="${version}"/> 
    6363                <property name="branch.path" value="${branch.path}"/> 
     64                <property name="branch.revision" value="${branch.revision}"/> 
    6465            </ant> 
    6566        </if> 
     
    9192 
    9293            <delete dir="distribution/greenstone3/lib/jni"/> 
    93             <copy todir="distribution/greenstone3/lib"><fileset dir="greenstone3/lib/jni"/></copy> 
     94            <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy> 
    9495             
    9596            <delete dir="distribution/greenstone3/gs2build/bin/windows"/> 
    96             <copy todir="distribution/greenstone3/gs2build/bin"><fileset dir="greenstone3/gs2build/bin/windows"/></copy> 
     97            <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy> 
    9798                         
    9899            <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    99             <copy todir="distribution/greenstone3/gs2build/bin"><fileset dir="greenstone3/gs2build/bin/java"/></copy> 
     100            <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy> 
    100101 
    101102        </if> 
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r15023 r15053  
    1212 
    1313    <target name="create-installer"> 
     14        <addressedcall target="setup-for-installer-creation"/> 
     15        <addressedcall target="compile-installer"/> 
     16        <addressedcall target="clean-up-after-installer-creation"/> 
     17    </target> 
     18 
     19    <target name="setup-for-installer-creation"> 
    1420        <if><bool><istrue value="${execute}"/></bool> 
    1521 
     
    1824            <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/> 
    1925            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
     26             
     27        </if> 
     28    </target> 
     29 
     30    <target name="compile-installer"> 
     31        <if><bool><istrue value="${execute}"/></bool> 
    2032 
    2133            <installer file="${basedir}/installer/greenstone-${version}-win32.jar" 
     
    4860    </target> 
    4961 
     62    <target name="clean-up-after-installer-creation"> 
     63        <if><bool><istrue value="${execute}"/></bool> 
     64            <delete file="${basedir}/installer/antinstall-config.xml"/> 
     65        </if> 
     66    </target> 
     67 
     68     
    5069</project> 
  • release-kits/wirk3/ant-scripts/create-launcher.xml

    r15025 r15053  
    3939            <launch4j configFile="${basedir}/launcher/launcher.xml" /> 
    4040 
     41            <echo>Putting a copy of the launcher in winutil</echo> 
     42            <copy file="${basedir}/launcher/launch-installer.exe" tofile="${basedir}/distribution/greenstone3/winutil/launcher.exe" overwrite="true"/> 
    4143        </if> 
    4244    </target> 
  • release-kits/wirk3/ant-scripts/init.xml

    r15023 r15053  
    185185        <echo level="info">Determining the branch path...</echo> 
    186186        <if> 
    187             <bool><equals arg1="trunk" arg2="${version}"/></bool> 
    188             <property name="branch.path" value="trunk"/> 
    189         </if> 
    190  
    191         <if> 
    192187            <bool><not><isset property="branch.path"/></not></bool> 
    193188            <fail>You have not specified a branch path where code will come from in the repository</fail> 
     
    196191        <echo level="info">Branch Path: ${branch.path}</echo> 
    197192        <echo level="info"/> 
    198  
    199         <!-- check branches exist --> 
    200         <property name="svn.greenstone3" value="${svn.root}/greenstone3/${branch.path}"/> 
    201         <property name="svn.gsdl" value="${svn.root}/gsdl/${branch.path}"/> 
    202         <property name="svn.gli" value="${svn.root}/gli/${branch.path}"/> 
    203         <property name="svn.indexers" value="${svn.root}/indexers/${branch.path}"/> 
    204         <property name="svn.documentation" value="${svn.root}/documentation/${branch.path}"/> 
    205  
    206         <!-- greenstone3 branch --> 
    207         <echo level="info">Checking that ${svn.greenstone3} exists...</echo> 
    208  
    209         <!-- try to put the html index of the location into the temp file --> 
    210         <setloglevel level="error"/> 
    211         <try> 
    212             <get src="${svn.greenstone3}" dest="${temp.file}"/> 
    213             <catch> 
    214                 <echo level="error">No, it does not exist</echo> 
    215                 <property name="svn.greenstone3.unavailable" value="true"/> 
    216             </catch> 
    217         </try> 
    218         <setloglevel level="info"/> 
    219         <if> 
    220             <bool><not><istrue value="${svn.greenstone3.unavailable}"/></not></bool> 
    221             <echo level="info">Yes, it exists</echo> 
    222         </if> 
    223  
    224         <!-- gsdl branch --> 
    225         <echo level="info">Checking that ${svn.gsdl} exists...</echo> 
    226         <setloglevel level="error"/> 
    227         <try> 
    228             <get src="${svn.gsdl}" dest="${temp.file}"/> 
    229             <catch> 
    230                 <echo level="error">No, it does not exist</echo> 
    231                 <property name="svn.gsdl.unavailable" value="true"/> 
    232             </catch> 
    233         </try> 
    234         <setloglevel level="info"/> 
    235         <if> 
    236             <bool><not><istrue value="${svn.gsdl.unavailable}"/></not></bool> 
    237             <echo level="info">Yes, it exists</echo> 
    238         </if> 
    239  
    240  
    241         <!-- gli branch --> 
    242         <echo level="info">Checking that ${svn.gli} exists...</echo> 
    243         <!-- try to put the  html index of the location into the temp file --> 
    244         <setloglevel level="error"/> 
    245         <try> 
    246             <get src="${svn.gli}" dest="${temp.file}"/> 
    247             <catch> 
    248                 <echo level="error">No, does not exist</echo> 
    249                 <property name="svn.gli.unavailable" value="true"/> 
    250             </catch> 
    251         </try> 
    252         <setloglevel level="info"/> 
    253         <if> 
    254             <bool><not><istrue value="${svn.gli.unavailable}"/></not></bool> 
    255             <echo level="info">Yes, it exists</echo> 
    256         </if> 
    257  
    258  
    259         <!-- indexers branch --> 
    260         <echo level="info">Checking that ${svn.indexers} exists...</echo> 
    261         <!-- try to put the  html index of the location into the temp file --> 
    262         <setloglevel level="error"/> 
    263         <try> 
    264             <get src="${svn.indexers}" dest="${temp.file}"/> 
    265             <catch> 
    266                 <echo level="error">No, it does not exist</echo> 
    267                 <property name="svn.indexers.unavailable" value="true"/> 
    268             </catch> 
    269         </try> 
    270         <setloglevel level="info"/> 
    271         <if> 
    272             <bool><not><istrue value="${svn.indexers.unavailable}"/></not></bool> 
    273             <echo level="info">Yes, it exists</echo> 
    274         </if> 
    275  
    276         <!-- documentation branch --> 
    277         <echo level="info">Checking that ${svn.documentation} exists...</echo> 
    278         <!-- try to put the  html index of the location into the temp file --> 
    279         <setloglevel level="error"/> 
    280         <try> 
    281             <get src="${svn.documentation}" dest="${temp.file}"/> 
    282             <catch> 
    283                 <echo level="error">No, it does not exist</echo> 
    284                 <property name="svn.documentation.unavailable" value="true"/> 
    285             </catch> 
    286         </try> 
    287         <setloglevel level="info"/> 
    288         <if> 
    289             <bool><not><istrue value="${svn.documentation.unavailable}"/></not></bool> 
    290             <echo level="info">Yes, it exists</echo> 
    291         </if> 
    292  
    293  
    294         <!-- clean up the temp file --> 
    295         <setloglevel level="error"/> 
    296         <delete file="${temp.file}"/> 
    297         <setloglevel level="info"/> 
    298  
    299  
    300         <!-- fail if some branches were missing --> 
    301         <if> 
    302             <bool> 
    303                 <or> 
    304                     <istrue value="${svn.greenstone3.unavailable}"/> 
    305                     <istrue value="${svn.gsdl.unavailable}"/> 
    306                     <istrue value="${svn.gli.unavailable}"/> 
    307                     <istrue value="${svn.indexers.unavailable}"/> 
    308                     <istrue value="${svn.documentation.unavailable}"/> 
    309                 </or> 
    310             </bool> 
    311             <fail>Some branches do not exist, or you are unable to access them from where you are. Please review the list above and create any branches that are missing, or run this script from somewhere with access to the repository.</fail> 
    312             <else> 
    313                 <echo level="info">All exist</echo> 
    314             </else> 
    315         </if> 
     193         
     194        <!-- check branch.revision --> 
     195        <echo level="info">Determining the branch revision...</echo> 
     196        <if> 
     197            <bool><not><isset property="branch.revision"/></not></bool> 
     198            <property name="branch.revision" value="HEAD"/> 
     199            <!--<echo level="info">No branch revision specified, defaulting to HEAD</echo>--> 
     200        </if> 
     201 
     202        <echo level="info">Branch Revision: ${branch.revision}</echo> 
     203        <echo level="info"/> 
    316204 
    317205    </target> 
  • release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

    r15023 r15053  
    101101        <move todir="${gs2build.home}/source/indexers" failonerror="false"><fileset dir="${gs2build.home}/indexers" defaultexcludes="no"/></move> 
    102102        <move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/> 
    103         <move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/> 
     103        <!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>--> 
    104104        <move file="${gs2build.home}/WIN32cfg.h" tofile="${gs2build.home}/source/WIN32cfg.h"/> 
    105105 
  • release-kits/wirk3/installer/antinstall-config.xml

    r15023 r15053  
    4545        <comment displayText="Please select the ports which the web server (Apache Tomcat) will use  will use. It is usually safe to accept the defaults by just clicking Next. The exception is when you are running other services on these ports - if this is the case, select some free ports and click Next."/> 
    4646 
     47        <text property="tomcat.server" defaultValue="localhost" displayText="Tomcat Server"/> 
    4748        <text property="tomcat.port" defaultValue="8080" displayText="Tomcat Port"/> 
    4849        <text property="tomcat.shutdown.port" defaultValue="8005" displayText="Tomcat Shutdown Port"/> 
  • release-kits/wirk3/installer/build.xml

    r15023 r15053  
    2424        <echo>antinstaller.jar: ${antinstaller.jar}</echo> 
    2525        <mkdir dir="${installDir}"/> 
    26  
    2726 
    2827        <!-- install binaries  --> 
     
    106105        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" /> 
    107106 
    108         <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH --> 
     107        <!-- get the found JRE_HOME --> 
     108        <exec executable="cmd" dir="${installDir}" outputproperty="backup.jre.home"><arg line="/C launch-installer.exe -find"/></exec> 
     109                 
     110        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH, and set the fallback JRE_HOME --> 
    109111        <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo> 
    110         <exec executable="cmd" output="${installDir}/gs3-setup.sh" append="true"> 
    111             <arg 
    112             line="/C echo set ANT_HOME=${installDir}/packages/ant 
    113 set PATH=%ANT_HOME%/bin:%PATH%"/> 
    114         </exec> 
     112        <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set ANT_HOME=${installDir}/packages/ant"/></exec> 
     113        <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set PATH=\%ANT_HOME\%/bin:\%PATH\%"/></exec> 
     114        <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set BACKUP_JRE_HOME=${backup.jre.home}"/></exec> 
    115115 
    116116        <!-- delete unneeded files -->       
  • release-kits/wirk3/launcher/launcher.xml

    r15023 r15053  
    11<launch4jConfig> 
    22  <dontWrapJar>true</dontWrapJar> 
    3   <headerType>0</headerType> 
     3  <headerType>1</headerType> 
    44  <jar>greenstone3.jar</jar> 
    55  <outfile>@basedir@\launcher\launch-installer.exe</outfile> 
  • release-kits/wirk3/wrapper/wrapper.cpp

    r15025 r15053  
    6363    //if it failed, launch the installer for the bundled java, then try again 
    6464    if ( launch_exit_code == 1 ) { 
    65         cout << "It appears that you do not have an installed Java Runtime Enviromnent (JRE)" << endl; 
     65        cout << "Greenstone requires Java Runtime Enviromnent (JRE) 1.4.0 or greater" << endl; 
     66        cout << "It appears that you do not have an a suitible JRE installed" << endl; 
     67 
    6668         
    6769        //is this an installer with the bundled JRE?