From: vincent@cubedesigners.com Date: Tue, 5 Jan 2021 14:48:43 +0000 (+0000) Subject: wip #4166 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fd2db358343e1af27a610f14da4ba4bb08f81ee7;p=cubeextranet.git wip #4166 @1 --- diff --git a/desktop/assets/install_flash_player_ppapi.exe b/desktop/assets/install_flash_player_ppapi.exe new file mode 100644 index 000000000..570491e69 Binary files /dev/null and b/desktop/assets/install_flash_player_ppapi.exe differ diff --git a/desktop/assets/uninstall_flash_player.exe b/desktop/assets/uninstall_flash_player.exe new file mode 100644 index 000000000..ea9a0a203 Binary files /dev/null and b/desktop/assets/uninstall_flash_player.exe differ diff --git a/desktop/windows-installer/Fluidbook-Workshop.exe b/desktop/windows-installer/Fluidbook-Workshop.exe index 3dba16597..3206a4b93 100644 Binary files a/desktop/windows-installer/Fluidbook-Workshop.exe and b/desktop/windows-installer/Fluidbook-Workshop.exe differ diff --git a/desktop/windows-installer/FluidbookWorkshop.nsis b/desktop/windows-installer/FluidbookWorkshop.nsis index 5ece42cf6..221ec276a 100644 --- a/desktop/windows-installer/FluidbookWorkshop.nsis +++ b/desktop/windows-installer/FluidbookWorkshop.nsis @@ -40,8 +40,10 @@ Section "" ;No components page, name is not important ; Set output path to the installation directory. SetOutPath $INSTDIR - File "H:\Works\cubeExtranet\desktop\assets\flashplayer_32_ppapi_debug.exe" - ExecWait "$INSTDIR\flashplayer_32_ppapi_debug.exe" + File "H:\Works\cubeExtranet\desktop\assets\install_flash_player_ppapi.exe" + File "H:\Works\cubeExtranet\desktop\assets\uninstall_flash_player.exe" + ExecWait "$INSTDIR\uninstall_flash_player.exe" + ExecWait "$INSTDIR\install_flash_player_ppapi.exe" ; Put file there SetOverwrite ifnewer