Changeset 19594

Timestamp:

2009-05-26T11:55:45+12:00 (15 years ago)

Author:

oranfry

Message:

cdrom wrapper needs to use temp dir, so basing it off web wrapper after all

Location:

release-kits/shared

Files:

• linux/cdrom-wrapper.cpp (deleted)
• linux/wrapper.cpp (modified) (7 diffs)
• windows/wrapper/cdrom-wrapper.cpp (deleted)
• windows/wrapper/wrapper.cpp (modified) (3 diffs)

release-kits/shared/linux/wrapper.cpp

@@ -2 +2 @@
 #include <fstream>
 #include <iomanip>
+#include <cstring>
 #include <cstdlib>
-
 using namespace std;
 
+#ifdef WEB
 #include "wrapper.h"
 #include "libsearch4j.h"
-
 bool extract_bundled_file( const char[], int, char*, bool );
+#endif
 
 int main(int argc, char** argv) {
@@ -15 +16 @@
     char owd[1024];
     getcwd(owd, sizeof(owd));
-
     string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR");
-    string tempdir = scratch + "/@[email protected]"; //temporary directory where we will store extracted files
-    string jarfile = tempdir + "/@[email protected]"; //where we will store the jar file
-    string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
+    string tempdir = scratch + "/greenstone-installer.tmp"; //temporary directory where we will store extracted files
     bool succeeded = false;
     bool textMode = false;
@@ -44 +42 @@
         return 1;
     }
+    
+    #ifdef WEB
+
+    string jarfile = tempdir + "/@[email protected]"; //where we will store the jar file
+    string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
+
 
     //extract files
@@ -62 +66 @@
     }
 
+    #endif
+
     //change to the temp directory
     chdir( tempdir.c_str() );
 
+
+    #ifdef WEB
     #ifdef java_is_bundled
     succeeded = (system( "/bin/sh -c ./@java.installer@ > /dev/null" ) == 0);
@@ -118 +126 @@
 
     }
+    #endif
+
+    #ifdef CDROM
+        string cmd = "";
+        cmd.append( owd );
+        cmd.append( "/Java/Linux/jre/bin/java -Dorig.dir=\"" );
+        cmd.append( owd );
+        cmd.append( "\" -jar " );
+        cmd.append( owd );
+        cmd.append( "/Java/Jars/linux.jar" );
+        system( cmd.c_str() );
+    #endif
 
     //change to the scratch dir for the following operation
@@ -129 +149 @@
 
 }
-
+#ifdef WEB
 bool extract_bundled_file( const char data[], int size, char* filename, bool make_executable) {
 
@@ -166 +186 @@
 
 }
+#endif

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

@@ -8 +8 @@
 #include <shellapi.h>
 #include <direct.h>
+
+using namespace std;
+
+#ifdef WEB
 #include "libsearch4j.h"
-
-using namespace std;
+#endif
 
 //globals
@@ -310 +313 @@
     delete tmp; //  deallocate memory
     
+    #ifdef WEB
     //rip out java archive if it is bundled
     set_splash_step( "XJAVA" );
@@ -380 +384 @@
         }
     }
+
+    #endif
+
+    #ifdef CDROM
+
+    //ask if they want to install, then do it if so
+    int choice = MessageBox(NULL, "Install Greenstone?", "Greenstone", MB_OKCANCEL | MB_ICONQUESTION );
+    if ( choice == IDOK ) {
+
+        //launch the jar
+        set_splash_step( "LAUNCHING" );
+        spoof_progress( SPOOF_TIME );
+        string cmd = "\"";
+        cmd.append( owd );
+        cmd.append( "\\Java\\Windows\\jre\\bin\\java.exe\" \"-Dorig.dir=" );
+        cmd.append( owd );
+        cmd.append( "\" -jar greenstone.jar" );
+
+        //hide splash screen
+        ShowWindow(splashWnd, SW_HIDE);
+        
+        //run the jar
+        int launch_exit_code = process( cmd, false );
+    }
+
+    #endif
     
     //clean up the temp directory