wait #5869 @1.5

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
index 3020d1c9c0328f74da40a051c0fd8c5bec642889..bfd8912190b158843a9fd2a3a1b77875bb1d896d 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
@@ -21,13 +21,8 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
             $p = $this->getFinalPackageDir() . '/' . $item;\r
             `rm -rf "$p"`;\r
         }\r
-        if ($zip) {\r
-            $res = $this->zip(null);\r
-        } else {\r
-            $res = $this->getFinalPackageDir();\r
-        }\r
         $this->postPackage();\r
-        return $res;\r
+        return $this->getURLBase('zip');\r
     }\r
 \r
     public function getAppPath()\r
@@ -35,12 +30,6 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
         return $this->getFinalPackageDir() . '/' . $this->exeName . '.app';\r
     }\r
 \r
-    public function getFinalPackageDir()\r
-    {\r
-        $res = parent::getFinalPackageDir();\r
-        return $res;\r
-    }\r
-\r
     protected function preparePackage()\r
     {\r
         $this->initTempDir();\r
@@ -77,51 +66,26 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
         copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/libffmpeg.dylib', $this->getAppPath() . '/Contents/Frameworks/nwjs Framework.framework/Versions/Current/libffmpeg.dylib');\r
     }\r
 \r
-    protected function signApp()\r
-    {\r
-        self::_signApp($this->getAppPath());\r
-    }\r
 \r
-    public static function _signApp($appPath, $back = true)\r
+    public function signApp()\r
     {\r
-        $local_root = '/Users/vincent/Sign/';\r
-        $dist_root = '/mnt/sshfs/macparis' . $local_root;\r
-\r
-        $f = 'tmp_' . md5(rand(0, 1000000)) . ".app";\r
-        $path = $dist_root . $f;\r
+        $remote_root = '/Users/macossign/Documents/Sign/';\r
+        $appPath = $this->getAppPath();\r
+        CubeIT_Util_Zip::archive($appPath . '/..', $appPath . ".zip", 1);\r
+        $remoteSigned = $remote_root . $this->exeName . '.app.zip';\r
 \r
-        // Copy app to mac\r
-        $cp = new CubeIT_CommandLine('cp');\r
-        $cp->setArg('r');\r
-        $cp->setArg(null, $appPath);\r
-        $cp->setArg(null, $path);\r
-        $cp->execute();\r
-        $cp->debug();\r
+        $ssh = new CubeIT_Networking_SSH2('paris.cubedesigners.com', 'macossign', 'rntj55bw', 22622);\r
+        $ssh->send($appPath . ".zip", $remoteSigned);\r
 \r
         // Sign app\r
-        $cl = new CubeIT_CommandLine($local_root . 'sign');\r
-        $cl->setSSH(wsExporter::VINCENT, 'vincent', 'atacama', 22022);\r
-        $cl->setArg(null, $local_root . $f);\r
-        $cl->execute();\r
+        $cl = new CubeIT_CommandLine($remote_root . 'sign3');\r
+        $cl->setArg(null, $this->exeName);\r
+        $cl->execute($ssh);\r
         $cl->debug();\r
-        $res = $cl->output;\r
-\r
-        if ($back) {\r
-            // Copy back signed\r
-            $cp = new CubeIT_CommandLine('rsync');\r
-            $cp->setArg('r');\r
-            $cp->setArg('l');\r
-            $cp->setArg('p');\r
-            $cp->setArg('D');\r
-            $cp->setArg('v');\r
-            $cp->setArg(null, $path . '/');\r
-            $cp->setArg(null, $appPath . '/');\r
-            $cp->setArg('delete');\r
-            $cp->execute();\r
-            $cp->debug();\r
-        }\r
 \r
-        // `rm -rf $path`;\r
-        return $res;\r
+        $finalPath = $this->getPathBase('zip');\r
+\r
+        $ssh->recv($remoteSigned, $finalPath);\r
+        $ssh->unlink($remoteSigned);\r
     }\r
 }\r

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 bce65171fd58d1c89a127d81fcbc8b89e6cd94d3..5b21b18b870ed1d9ed7aac60cf0825cfbc3f4b06 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
@@ -77,7 +77,6 @@ class wsPackagerWinEXEHTML extends wsPackager
         }\r
 \r
         $this->replaceFFMpeg();\r
-\r
         $this->signExe();\r
     }\r
 \r