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 (file)
index 0000000..570491e
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 (file)
index 0000000..ea9a0a2
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 3dba165979db0cccc2300b9c4dbfe36ca4f03003..3206a4b932cd11a6cd99d3fa42b9eb253d873fb0 100644 (file)
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 5ece42cf6cf8d9e5984aabeb0b7b77f1b290058f..221ec276a2fda995a6e65c1fa41338136cd7e2c3 100644 (file)
--- 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.\r
     SetOutPath $INSTDIR\r
 \r
-    File "H:\Works\cubeExtranet\desktop\assets\flashplayer_32_ppapi_debug.exe"\r
-    ExecWait "$INSTDIR\flashplayer_32_ppapi_debug.exe"\r
+    File "H:\Works\cubeExtranet\desktop\assets\install_flash_player_ppapi.exe"\r
+    File "H:\Works\cubeExtranet\desktop\assets\uninstall_flash_player.exe"\r
+    ExecWait "$INSTDIR\uninstall_flash_player.exe"\r
+    ExecWait "$INSTDIR\install_flash_player_ppapi.exe"\r
 \r
     ; Put file there\r
     SetOverwrite ifnewer\r