[Title] Fix that installmanager(windows 32bit) has virus threats.

[Issue] Redmine #10607

Change-Id: Ie73a161a717c54fb42e55c2ab00063f5db82995d

diff --git a/os_stubs/windows/InstallManager-64.nsi b/os_stubs/windows/InstallManager-64.nsi
index 6fe35f8..6a7ea80 100644 (file)
--- a/os_stubs/windows/InstallManager-64.nsi
+++ b/os_stubs/windows/InstallManager-64.nsi
@@ -161,7 +161,6 @@ done:
        RMDir /r $INSTDIR\r
        SetOutPath $INSTDIR\r
        SetOverwrite on\r
-       File /r "img\*.exe"\r
        File /r "img\*.conf"\r
        File /r "img\*.jar"\r
        DetailPrint "install manager will be executed"\r
@@ -208,7 +207,7 @@ done:
        ${EndIf}\r
 \r
        ${If} $R0 == ""\r
-               Exec "$INSTDIR\InstManager.exe $2"\r
+               Exec "javaw -jar $INSTDIR\InstallManager.jar $2"\r
        ${Else}\r
                StrCpy $3 "$2 $R0"\r
                System::Call 'kernel32::GetStdHandle(i -11)i.r0' ;try to get stdout\r

diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi
index 6d84c74..4027edf 100644 (file)
--- a/os_stubs/windows/InstallManager.nsi
+++ b/os_stubs/windows/InstallManager.nsi
@@ -160,7 +160,6 @@ done:
        RMDir /r $INSTDIR\r
        SetOutPath $INSTDIR\r
        SetOverwrite on\r
-       File /r "img\*.exe"\r
        File /r "img\*.conf"\r
        File /r "img\*.jar"\r
        DetailPrint "install manager will be executed"\r
@@ -205,7 +204,7 @@ done:
        ${EndIf}\r
 \r
        ${If} $R0 == ""\r
-               Exec "$INSTDIR\InstManager.exe $2"\r
+               Exec "javaw -jar $INSTDIR\InstallManager.jar $2"\r
        ${Else}\r
                StrCpy $3 "$2 $R0"\r
                System::Call 'kernel32::GetStdHandle(i -11)i.r0' ;try to get stdout\r

diff --git a/package/build.windows b/package/build.windows
index 574af2a..18de018 100755 (executable)
--- a/package/build.windows
+++ b/package/build.windows
@@ -39,14 +39,10 @@ makeExecutable() {
        case ${TARGET_OS} in
         windows-32)
                        cp -rf $SRCDIR/InstallManager_java/dist/windows32/InstallManager.jar ${buildDir}/img
-                       cp -rf $SRCDIR/os_stubs/windows/32/InstManager.exe ${buildDir}/img/
-                       cp -rf $SRCDIR/os_stubs/windows/32/InstManagerC.exe ${buildDir}/img/
                        cp -rf $SRCDIR/os_stubs/windows/InstallManager.nsi ${buildDir}/
                ;;
         windows-64)
                        cp -rf $SRCDIR/InstallManager_java/dist/windows64/InstallManager.jar ${buildDir}/img
-                       cp -rf $SRCDIR/os_stubs/windows/64/InstManager.exe ${buildDir}/img/
-                       cp -rf $SRCDIR/os_stubs/windows/64/InstManagerC.exe ${buildDir}/img/
                        cp -rf $SRCDIR/os_stubs/windows/InstallManager-64.nsi ${buildDir}/InstallManager.nsi
         ;;
         *)