From: yongsung1.kim Date: Tue, 8 Oct 2013 06:01:02 +0000 (+0900) Subject: [Title] Fix that installmanager(windows 32bit) has virus threats. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68a4500a5716f8da425e7736683c4bff004edda6;p=sdk%2Finstaller%2Finstall-manager.git [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 --- a/os_stubs/windows/InstallManager-64.nsi +++ b/os_stubs/windows/InstallManager-64.nsi @@ -161,7 +161,6 @@ done: RMDir /r $INSTDIR SetOutPath $INSTDIR SetOverwrite on - File /r "img\*.exe" File /r "img\*.conf" File /r "img\*.jar" DetailPrint "install manager will be executed" @@ -208,7 +207,7 @@ done: ${EndIf} ${If} $R0 == "" - Exec "$INSTDIR\InstManager.exe $2" + Exec "javaw -jar $INSTDIR\InstallManager.jar $2" ${Else} StrCpy $3 "$2 $R0" System::Call 'kernel32::GetStdHandle(i -11)i.r0' ;try to get stdout diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi index 6d84c74..4027edf 100644 --- a/os_stubs/windows/InstallManager.nsi +++ b/os_stubs/windows/InstallManager.nsi @@ -160,7 +160,6 @@ done: RMDir /r $INSTDIR SetOutPath $INSTDIR SetOverwrite on - File /r "img\*.exe" File /r "img\*.conf" File /r "img\*.jar" DetailPrint "install manager will be executed" @@ -205,7 +204,7 @@ done: ${EndIf} ${If} $R0 == "" - Exec "$INSTDIR\InstManager.exe $2" + Exec "javaw -jar $INSTDIR\InstallManager.jar $2" ${Else} StrCpy $3 "$2 $R0" System::Call 'kernel32::GetStdHandle(i -11)i.r0' ;try to get stdout diff --git a/package/build.windows b/package/build.windows index 574af2a..18de018 100755 --- 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 ;; *)