Changeset 19594 for release-kits/shared/windows

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/windows/wrapper

Files:

• cdrom-wrapper.cpp (deleted)
• wrapper.cpp (modified) (3 diffs)

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