Changeset 15054 for release-kits

Timestamp:

2008-03-06T14:09:51+13:00 (16 years ago)

Author:

oranfry

Message:

hacked launch4j to report javas location aswell as just running it

Location:

release-kits/shared/launch4j/head_src

Files:

• consolehead/consolehead.c (modified) (3 diffs)
• guihead/guihead.c (modified) (1 diff)
• head.c (modified) (5 diffs)
• head.h (modified) (1 diff)

release-kits/shared/launch4j/head_src/consolehead/consolehead.c

@@ -29 +29 @@
 int main(int argc, char* argv[])
 {
+    
+    //added by oran - to store the value of the 'subcommand' to be run
+    char subcom[8] = "run";
+
     setConsoleFlag();
     HMODULE hLibrary = NULL;
@@ -42 +46 @@
            strcat(cmdLine, "\"");
         }
+        
+        if ( _stricmp(argv[i], "-find") == 0 ) {
+            strcpy( subcom, "find" );
+        } else if ( _stricmp(argv[i], "-compare") == 0 ) {
+            strcpy( subcom, "compare" );
+        }
+        
         if (i < argc - 1) {
             strcat(cmdLine, " ");
         }
     }
-    if (!prepare(hLibrary, cmdLine)) {
+        
+    if (!prepare(hLibrary, cmdLine, subcom)) {
         if (hLibrary != NULL) {
             FreeLibrary(hLibrary);
@@ -53 +65 @@
     }
     FreeLibrary(hLibrary);
-
     int result = (int) execute(TRUE);
     if (result == -1) {

release-kits/shared/launch4j/head_src/guihead/guihead.c

@@ -42 +42 @@
                      LPSTR     lpCmdLine,
                      int       nCmdShow) {
+    
     HMODULE hLibrary = NULL;
-    if (!prepare(hLibrary, lpCmdLine)) {
+    if (!prepare(hLibrary, lpCmdLine, "run")) {
         if (hLibrary != NULL) {
             FreeLibrary(hLibrary);

release-kits/shared/launch4j/head_src/head.c

@@ -40 +40 @@
 
 char workingDir[_MAX_PATH] = {0};
+char javaHome[_MAX_PATH] = {0};
 char cmd[_MAX_PATH] = {0};
 char args[MAX_ARGS] = {0};
+
+//added by oran - whether to run the jar, print out java home, or compare java version strings
+char subcommand[8] = "run"; //can be "run", "find", "compare" - run means behave like unhacked launch4j
 
 void setConsoleFlag() {
@@ -250 +254 @@
 }
 
-BOOL prepare(HMODULE hLibrary, char *lpCmdLine) {
+//added by oran - added the subcom argument
+BOOL prepare(HMODULE hLibrary, char *lpCmdLine, char *subcom) {
     char tmp[MAX_ARGS] = {0};
     GetEnvironmentVariable("launch4j", tmp, STR);
     debug = _stricmp(tmp, "debug") == 0;
+    
+    //added by oran - set the subcommand
+    strcpy( subcommand, subcom );
 
     // Open executable
@@ -312 +320 @@
                 strcat(txt, javaMaxVer);
             }
-            msgBox(txt);
-            showJavaWebPage();
+            //msgBox(txt);
+            //showJavaWebPage();
             return FALSE;
         }
@@ -322 +330 @@
     }
 
-    // Append a path to the Path environment variable
-    char jreBinPath[_MAX_PATH];
-    strcpy(jreBinPath, cmd);
-    strcat(jreBinPath, "\\bin");
-    if (!appendToPathVar(jreBinPath)) {
-        msgBox("Cannot set the Path environment variable.");
-        return FALSE;
-    }
-
+    //before appending the launcher, save the cmd in javaHome
+    strcpy( javaHome, cmd );
+
+    //only affect the PATH if subcommand is run
+    if ( _stricmp( subcommand, "run" ) ) {
+        // Append a path to the Path environment variable
+        char jreBinPath[_MAX_PATH];
+        strcpy(jreBinPath, cmd);
+        strcat(jreBinPath, "\\bin");
+        if (!appendToPathVar(jreBinPath)) {
+            msgBox("Cannot set the Path environment variable.");
+            return FALSE;
+        }
+    }
+    
     appendLauncher(setProcName, exePath, pathLen, cmd);
 
@@ -454 +468 @@
 
 DWORD execute(BOOL wait) {
-    STARTUPINFO si;
-    memset(&pi, 0, sizeof(pi));
-    memset(&si, 0, sizeof(si));
-    si.cb = sizeof(si);
-
-    DWORD dwExitCode = -1;
-    char cmdline[MAX_ARGS];
-    strcpy(cmdline, "\"");
-    strcat(cmdline, cmd);
-    strcat(cmdline, "\" ");
-    strcat(cmdline, args);
-    if (CreateProcess(NULL, cmdline, NULL, NULL,
-            TRUE, 0, NULL, NULL, &si, &pi)) {
-        if (wait) {
-            WaitForSingleObject(pi.hProcess, INFINITE);
-            GetExitCodeProcess(pi.hProcess, &dwExitCode);
-            closeHandles();
-        } else {
-            dwExitCode = 0;
-        }
-    }
-    return dwExitCode;
-}
+    //added by oran - the original execute function has been wrapped in this if, and a few else ifs added after that
+    if ( _stricmp(subcommand, "run") == 0 ) {
+    
+        STARTUPINFO si;
+        memset(&pi, 0, sizeof(pi));
+        memset(&si, 0, sizeof(si));
+        si.cb = sizeof(si);
+
+        DWORD dwExitCode = -1;
+        char cmdline[MAX_ARGS];
+        strcpy(cmdline, "\"");
+        strcat(cmdline, cmd);
+        strcat(cmdline, "\" ");
+        strcat(cmdline, args);
+        if (CreateProcess(NULL, cmdline, NULL, NULL,
+                TRUE, 0, NULL, NULL, &si, &pi)) {
+            if (wait) {
+                WaitForSingleObject(pi.hProcess, INFINITE);
+                GetExitCodeProcess(pi.hProcess, &dwExitCode);
+                closeHandles();
+            } else {
+                dwExitCode = 0;
+            }
+        }
+        return dwExitCode;
+
+    } else if ( _stricmp(subcommand, "find") == 0 ) {
+        printf("%s\n", javaHome);
+    } else if ( _stricmp(subcommand, "compare") == 0 ) {
+        printf("%s\n", foundJavaVer);
+    }
+}

release-kits/shared/launch4j/head_src/head.h

@@ -69 +69 @@
 void catJavaw(char* jrePath);
 BOOL isJrePathOk(char* path);
-BOOL prepare(HMODULE hLibrary, char *lpCmdLine);
+BOOL prepare(HMODULE hLibrary, char *lpCmdLine, char *subcom);
 void closeHandles();
 BOOL appendToPathVar(char* path);