From: vincent@cubedesigners.com Date: Mon, 25 Apr 2022 18:17:44 +0000 (+0000) Subject: wait #5255 @3.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9ba25b14674bb1388c6e860aca14cb1ca7dbb905;p=cubeextranet.git wait #5255 @3.5 --- diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 72c7dfbc8..03c6cd0d8 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -1857,7 +1857,7 @@ class wsMaintenance public static function azureTTSVoices() { $api = new \Cubist\Azure\TTS\Api('28fdfcdcc7f141b29cd9db4afc5779c5'); - print_r($api->listVoices()); + print_r($api->listVoices(true)); } diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index 20c6dcd7b..4a7ac0c20 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -84,7 +84,7 @@ class wsExporter $phonegap->addLibrary(array('from' => WS_COMPILE_ASSETS . '/_html5app/_android/fluidbook-dependencies', 'to' => '/fluidbook-dependencies')); $phonegap->addLibrary(array('from' => WS_COMPILE_ASSETS . '/_html5app/_android/res', 'to' => '/app/src/main/res')); - $phonegap->setDistantCompiler(self::VINCENT, 'Vincent', 's77vpo*wu5', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY); + $phonegap->setDistantCompiler(self::VINCENT, 'vince', 'Y@mUC9mY2DOYWXkN', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY); $phonegap->setSourceVariables(array('background' => '0xff' . $collection->settings['couleurD'], 'orientation' => $collection->settings['orientation']) ); diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php index 731adb908..c33b053a0 100644 --- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php +++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php @@ -67,6 +67,30 @@ class wsPackagerWinEXEHTML extends wsPackager $cl->debug(); $this->replaceFFMpeg(); + + $this->signExe(); + } + + function signExe() + { + $exe = $this->buildPath . '/' . $this->exeName . '/windows-x64/' . $this->exeName . '.exe'; + $this->_sign($exe); + } + + function _sign($exe) + { + $rand = 'sign-' . rand(1000000, 9999999) . '.exe'; + copy($exe, '/mnt/sshfs/vincent/D:/Sign/' . $rand); + $cli = new CubeIT_CommandLine('C:/ProgramData/chocolatey/bin/psexec'); + $cli->setArg('i', 1); + $cli->setArg('u', 'vince'); + $cli->setArg('p', 'Y@mUC9mY2DOYWXkN'); + $cli->setArg(null, "D:/Works/Scripts/codesign/sign.exe $rand"); + $cli->setSSH('paris.cubedesigners.com', 'vince', 'Y@mUC9mY2DOYWXkN', '22322'); + $cli->execute(); + $cli->debug(); + sleep(5); + copy('/mnt/sshfs/vincent/D:/Sign/' . $rand, $exe); } function replaceFFMpeg() 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 677d8854a..c017d25ee 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 @@ -87,9 +87,16 @@ class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML $makensis->execute(); $makensis->debug(); + $this->signInstaller(); + return $this->getURLBase('exe'); } + public function signInstaller() + { + $this->_sign($this->getPathBase('exe')); + } + public function __destruct() {