Changeset 15146 for release-kits
- Timestamp:
- 2008-03-28T12:53:30+13:00 (16 years ago)
- 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"?> 2 2 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN" "http://antinstaller.sf.net/dtd/antinstall-config-0.8.dtd"> 3 3 <installer -
release-kits/wirk3/installer/build.xml
r15095 r15146 92 92 <echo message="Changing tomcat ports tomcat's server.xml"/> 93 93 <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}" /> 94 95 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" /> 95 96 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" /> … … 116 117 117 118 <!-- 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> 119 120 <concat destfile="${installDir}/machine.bat" append="yes"> 120 121 set ANT_HOME=${installDir}\packages\ant 121 122 set PATH=%ANT_HOME%\bin;%PATH% 122 123 set BACKUP_JAVA_HOME=${backup.jre.home} 123 </concat> 124 </concat>--> 124 125 125 126 -
release-kits/wirk3/wrapper/wrapper.cpp
r15095 r15146 77 77 extractResource( "GREENSTONE_JAR", "JAR", (char*) jarLocation.c_str() ); 78 78 79 //change to the temp directory and start the jar79 //change to the temp directory 80 80 SetCurrentDirectory( tempdir.c_str() ); 81 81 … … 107 107 if ( _stricmp( r, "y" ) == 0 ) { 108 108 system( "@java.installer@" ); 109 jvmFound = true; //assume the java installation went well 109 110 } 110 jvmFound = true; //assume the java installation went well111 111 } else { 112 112 //no, JRE is not bundled … … 124 124 launch_exit_code = system("search4j.exe -m @java.min.version@ -l greenstone3.jar"); 125 125 126 // if it failed, launch the installer for the bundled java, then try again126 //report how it went 127 127 if ( launch_exit_code == 0 ) { 128 128 cout << "Setup complete" << endl;
Note:
See TracChangeset
for help on using the changeset viewer.