Changeset 15146

Timestamp:

2008-03-28T12:53:30+13:00 (16 years ago)

Author:

oranfry

Message:

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

Location:

release-kits/wirk3

Files:

• installer/antinstall-config.xml (modified) (1 diff)
• installer/build.xml (modified) (2 diffs)
• wrapper/wrapper.cpp (modified) (3 diffs)

release-kits/wirk3/installer/antinstall-config.xml

@@ -1 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN" "http://antinstaller.sf.net/dtd/antinstall-config-0.8.dtd">
 <installer

release-kits/wirk3/installer/build.xml

@@ -92 +92 @@
         <echo message="Changing tomcat ports tomcat's server.xml"/>
         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
+        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" />
         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" />
         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" />
@@ -116 +117 @@
                 
         <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH, and set the fallback JRE_HOME -->
-        <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
+        <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
         <concat destfile="${installDir}/machine.bat" append="yes">
 set ANT_HOME=${installDir}\packages\ant
 set PATH=%ANT_HOME%\bin;%PATH%
 set BACKUP_JAVA_HOME=${backup.jre.home}
-</concat>
+</concat>-->
         
 

release-kits/wirk3/wrapper/wrapper.cpp

@@ -77 +77 @@
     extractResource( "GREENSTONE_JAR", "JAR", (char*) jarLocation.c_str() );
     
-    //change to the temp directory and start the jar
+    //change to the temp directory
     SetCurrentDirectory( tempdir.c_str() );
 
@@ -107 +107 @@
             if ( _stricmp( r, "y" ) == 0 ) {
                 system( "@java.installer@" );
+                jvmFound = true; //assume the java installation went well
             }
-            jvmFound = true; //assume the java installation went well
         } else {
             //no, JRE is not bundled
@@ -124 +124 @@
         launch_exit_code = system("search4j.exe -m @java.min.version@ -l greenstone3.jar");
         
-        //if it failed, launch the installer for the bundled java, then try again
+        //report how it went
         if ( launch_exit_code == 0 ) {
             cout << "Setup complete" << endl;