wait #5275 @1.5

diff --git a/fluidbook/compile/html-silent.nsi b/fluidbook/compile/html-silent.nsi
index 876bbb7e1e7449fcd3a584f335708688370eee92..aa041b98946d1d6d40d32683952de9bf25a73b59 100644 (file)
--- a/fluidbook/compile/html-silent.nsi
+++ b/fluidbook/compile/html-silent.nsi
@@ -4,6 +4,8 @@
 !define FLUIDBOOKNAME "$name"\r
 !define REG_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\$fname"\r
 \r
+Unicode true\r
+\r
 ; The name of the installer\r
 Name "${FLUIDBOOKNAME}"\r
 \r
@@ -48,7 +50,7 @@ Section "" ;No components page, name is not important
 \r
     ; Put file there\r
     SetOverwrite ifnewer\r
-    File /a  /r "$fdir\*"\r
+    File /r "$fdir\*"\r
 \r
     ; Create shortcut\r
     CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"\r

diff --git a/fluidbook/compile/html.nsi b/fluidbook/compile/html.nsi
index 1656b40d78ac27c3f885a7b32bbc0a9dcd636236..f5c211b6b7cf91289388f80061ef023aa9396b00 100644 (file)
--- a/fluidbook/compile/html.nsi
+++ b/fluidbook/compile/html.nsi
@@ -44,7 +44,7 @@ Section "" ;No components page, name is not important
 \r
     ; Put file there\r
     SetOverwrite ifnewer\r
-    File /a  /r "$fdir\*"\r
+    File /r "$fdir\*"\r
 \r
     ; Create shortcut\r
     CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"\r

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index a260406577ca6c80fd739b8bcb06567fc9f89c12..e8d21c35bf637aa10eae8a4316a627dd8a516ebd 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1795,6 +1795,8 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         if (!$this->config->pdfName) {
             $this->config->pdfName = 'document.pdf';
         }
+        $this->config->pdfName = CubeIT_Text::removeAccents($this->config->pdfName);
+
         if ($res !== false) {
             $this->vdir->copy($res, 'data/' . $this->config->pdfName);
         }

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
index c017d25eed6feae3b2a44a8384607dd13b17e202..4d24c183e43499d190b459b4559a85ac78ba3dab 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
@@ -83,12 +83,20 @@ class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML
         $tmp = cubeFiles::tempnam() . '.nsi';\r
         file_put_contents($tmp, $this->nsi);\r
         $makensis = new CubeIT_CommandLine('/usr/local/bin/makensis');\r
+        $makensis->setArg(null,'-V4');\r
         $makensis->setArg(null, $tmp);\r
         $makensis->execute();\r
         $makensis->debug();\r
+        if (!file_exists($this->getPathBase('exe'))) {\r
+            die('Error while building the installer  : ' . $this->getPathBase('exe') . ' // ' . $makensis->commande . ' // ' . $makensis->output);\r
+        }\r
 \r
         $this->signInstaller();\r
 \r
+        if (!file_exists($this->getPathBase('exe'))) {\r
+            die('Error during the signing process : ' . $this->getPathBase('exe'));\r
+        }\r
+\r
         return $this->getURLBase('exe');\r
     }\r
 \r