wait #5255 @3.5

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 72c7dfbc824f1dc0fd51eb025424ee032458c96f..03c6cd0d87275776788e24e498fbb1e1ccfc7232 100644 (file)
--- 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 20c6dcd7b2c9b1549cab3d136630242b795d501b..4a7ac0c20e38c567cb9327e687dfe2f675dbf457 100644 (file)
--- 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 731adb90873eac1d28b5eae92aa4972553e6f1f6..c33b053a0bb37251fb5f4c656f8a54638187200d 100644 (file)
--- 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();\r
 \r
         $this->replaceFFMpeg();\r
+\r
+        $this->signExe();\r
+    }\r
+\r
+    function signExe()\r
+    {\r
+        $exe = $this->buildPath . '/' . $this->exeName . '/windows-x64/' . $this->exeName . '.exe';\r
+        $this->_sign($exe);\r
+    }\r
+\r
+    function _sign($exe)\r
+    {\r
+        $rand = 'sign-' . rand(1000000, 9999999) . '.exe';\r
+        copy($exe, '/mnt/sshfs/vincent/D:/Sign/' . $rand);\r
+        $cli = new CubeIT_CommandLine('C:/ProgramData/chocolatey/bin/psexec');\r
+        $cli->setArg('i', 1);\r
+        $cli->setArg('u', 'vince');\r
+        $cli->setArg('p', 'Y@mUC9mY2DOYWXkN');\r
+        $cli->setArg(null, "D:/Works/Scripts/codesign/sign.exe $rand");\r
+        $cli->setSSH('paris.cubedesigners.com', 'vince', 'Y@mUC9mY2DOYWXkN', '22322');\r
+        $cli->execute();\r
+        $cli->debug();\r
+        sleep(5);\r
+        copy('/mnt/sshfs/vincent/D:/Sign/' . $rand, $exe);\r
     }\r
 \r
     function replaceFFMpeg()\r

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 677d8854a4c89741d73bcb31b5ec6432992aeac2..c017d25eed6feae3b2a44a8384607dd13b17e202 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
@@ -87,9 +87,16 @@ class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML
         $makensis->execute();\r
         $makensis->debug();\r
 \r
+        $this->signInstaller();\r
+\r
         return $this->getURLBase('exe');\r
     }\r
 \r
+    public function signInstaller()\r
+    {\r
+        $this->_sign($this->getPathBase('exe'));\r
+    }\r
+\r
     public function __destruct()\r
     {\r
 \r