Changeset 16203

Timestamp:

2008-06-26T12:47:45+12:00 (15 years ago)

Author:

oranfry

Message:

made the wrapper general, so it can be used with greenstone2 or greenstone3 release kits

Location:

release-kits/shared/windows/wrapper

Files:

• wrapper.cpp (modified) (6 diffs)
• wrapper.rc (modified) (1 diff)

release-kits/shared/windows/wrapper/wrapper.cpp

@@ -286 +286 @@
     char* tmp = getenv( "TMP" );
     char id[6]; for( int i=0; i<5; i++ ) id[i] = (char)((rand()%26) + 97); id[5] = '\0'; //id for this instance
-    string tempdir = ""; tempdir.append( tmp ); tempdir.append( "\\Greenstone3-" ); tempdir.append( id );
+    string tempdir = ""; tempdir.append( tmp ); tempdir.append( "\\Greenstone-" ); tempdir.append( id );
     _mkdir( tempdir.c_str() );
     SetCurrentDirectory( tempdir.c_str() );
@@ -306 +306 @@
 
         //did not find a good java
-        string message = "Greenstone requires java @java.min.version@ or greater, but ";
+        string message = "This version of Greenstone requires java @java.min.version@ or greater, but ";
         
         //tell them if java is absent or just too old
@@ -336 +336 @@
             set_splash_progress( 100 ); //we are done searching
             message.append( "Please install java (@java.min.version@ or newer) and try again.\n" );
-            message.append( "Or, download a Greentsone3 installer with bundled java and use that instead of this one" );
+            message.append( "Or, download an installer with bundled java and use that instead of this one" );
             string title = "Installation Failed: Couldn't find java";
             MessageBox(NULL, message.c_str(), title.c_str(), MB_OK);
@@ -347 +347 @@
                 
         //extract the jar
-        string jarLocation = ""; jarLocation.append( tempdir ); jarLocation.append( "\\greenstone3.jar" );
+        string jarLocation = ""; jarLocation.append( tempdir ); jarLocation.append( "\\greenstone.jar" );
         //set_splash_status( hInstance, statusWnd, "STATUS_JAR", 0 );
         
@@ -358 +358 @@
         string cmd = "\"";
         cmd.append( foundJvm.getWinExecutable() );
-        cmd.append( "\" -jar greenstone3.jar" );
+        cmd.append( "\" -jar greenstone.jar" );
         
         //hide splash screen
@@ -375 +375 @@
     
     //clean up the temp directory
-    _unlink("greenstone3.jar");
+    _unlink("greenstone.jar");
     _unlink("ant.install.log");
     _unlink("@java.installer@");

release-kits/shared/windows/wrapper/wrapper.rc

@@ -16 +16 @@
 STEP_XJAR BITMAP "step-xjar.bmp"
 STEP_LAUNCHING BITMAP "step-launching.bmp"
-MAINICON ICON "gs3.ico"
+MAINICON ICON "icon.ico"
 
 //resources are automatically appended here