Changeset 21630 for main/trunk/release-kits/shared/linux

Timestamp:

2010-01-26T14:44:30+13:00 (14 years ago)

Author:

oranfry

Message:

tidy up for greenstone3, and made wrap shared

File:

• main/trunk/release-kits/shared/linux/wrapper.cpp (modified) (3 diffs)

main/trunk/release-kits/shared/linux/wrapper.cpp

@@ -96 +96 @@
     #ifndef CDROM
 
-    string jarfile = tempdir + "/@installer.name@.jar"; //where we will store the jar file
+    string jarfile = tempdir + "/greenstone.jar"; //where we will store the jar file
     string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
 
@@ -102 +102 @@
     //extract files
     cout << "Extracting installer jar..." << endl;
-    succeeded = extract_bundled_file( @installer.name@jar, sizeof(@installer.name@jar), (char*)jarfile.c_str(), false);
+    succeeded = extract_bundled_file( greenstonejar, sizeof(greenstonejar), (char*)jarfile.c_str(), false);
 
     #ifdef java_is_bundled
@@ -166 +166 @@
         cout << "Launching Installer ..." << endl;
         int launch_exit_code = 0;
-        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M -jar @installer.name@.jar" + (text_mode?" text":"") ).c_str() );
+        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M -jar greenstone.jar" + (text_mode?" text":"") ).c_str() );
 
         //report how it went