Changeset 15146


Ignore:
Timestamp:
2008-03-28T12:53:30+13:00 (14 years ago)
Author:
oranfry
Message:

a few changes to wirk3 to keep it up-to-date with lirk3

Location:
release-kits/wirk3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/installer/antinstall-config.xml

    r15095 r15146  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN" "http://antinstaller.sf.net/dtd/antinstall-config-0.8.dtd">
    33<installer
  • release-kits/wirk3/installer/build.xml

    r15095 r15146  
    9292        <echo message="Changing tomcat ports tomcat's server.xml"/>
    9393        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
     94        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" />
    9495        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" />
    9596        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" />
     
    116117               
    117118        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH, and set the fallback JRE_HOME -->
    118         <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
     119        <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
    119120        <concat destfile="${installDir}/machine.bat" append="yes">
    120121set ANT_HOME=${installDir}\packages\ant
    121122set PATH=%ANT_HOME%\bin;%PATH%
    122123set BACKUP_JAVA_HOME=${backup.jre.home}
    123 </concat>
     124</concat>-->
    124125       
    125126
  • release-kits/wirk3/wrapper/wrapper.cpp

    r15095 r15146  
    7777    extractResource( "GREENSTONE_JAR", "JAR", (char*) jarLocation.c_str() );
    7878   
    79     //change to the temp directory and start the jar
     79    //change to the temp directory
    8080    SetCurrentDirectory( tempdir.c_str() );
    8181
     
    107107            if ( _stricmp( r, "y" ) == 0 ) {
    108108                system( "@java.installer@" );
     109                jvmFound = true; //assume the java installation went well
    109110            }
    110             jvmFound = true; //assume the java installation went well
    111111        } else {
    112112            //no, JRE is not bundled
     
    124124        launch_exit_code = system("search4j.exe -m @java.min.version@ -l greenstone3.jar");
    125125       
    126         //if it failed, launch the installer for the bundled java, then try again
     126        //report how it went
    127127        if ( launch_exit_code == 0 ) {
    128128            cout << "Setup complete" << endl;
Note: See TracChangeset for help on using the changeset viewer.