From cdf97595d6de159808b8d9adc69d56837c40a4b2 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 9 May 2022 08:52:10 +0000 Subject: [PATCH] wait #5275 @1.5 --- fluidbook/compile/html-silent.nsi | 4 +++- fluidbook/compile/html.nsi | 2 +- inc/ws/Util/html5/master/class.ws.html5.compiler.php | 2 ++ inc/ws/Util/packager/class.ws.packager.win.inst.html.php | 8 ++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fluidbook/compile/html-silent.nsi b/fluidbook/compile/html-silent.nsi index 876bbb7e1..aa041b989 100644 --- a/fluidbook/compile/html-silent.nsi +++ b/fluidbook/compile/html-silent.nsi @@ -4,6 +4,8 @@ !define FLUIDBOOKNAME "$name" !define REG_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\$fname" +Unicode true + ; The name of the installer Name "${FLUIDBOOKNAME}" @@ -48,7 +50,7 @@ Section "" ;No components page, name is not important ; Put file there SetOverwrite ifnewer - File /a /r "$fdir\*" + File /r "$fdir\*" ; Create shortcut CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico" diff --git a/fluidbook/compile/html.nsi b/fluidbook/compile/html.nsi index 1656b40d7..f5c211b6b 100644 --- a/fluidbook/compile/html.nsi +++ b/fluidbook/compile/html.nsi @@ -44,7 +44,7 @@ Section "" ;No components page, name is not important ; Put file there SetOverwrite ifnewer - File /a /r "$fdir\*" + File /r "$fdir\*" ; Create shortcut CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico" 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 a26040657..e8d21c35b 100644 --- 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"> 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 c017d25ee..4d24c183e 100644 --- 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'; file_put_contents($tmp, $this->nsi); $makensis = new CubeIT_CommandLine('/usr/local/bin/makensis'); + $makensis->setArg(null,'-V4'); $makensis->setArg(null, $tmp); $makensis->execute(); $makensis->debug(); + if (!file_exists($this->getPathBase('exe'))) { + die('Error while building the installer : ' . $this->getPathBase('exe') . ' // ' . $makensis->commande . ' // ' . $makensis->output); + } $this->signInstaller(); + if (!file_exists($this->getPathBase('exe'))) { + die('Error during the signing process : ' . $this->getPathBase('exe')); + } + return $this->getURLBase('exe'); } -- 2.39.5