(no commit message)

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 6323ff8314a4d692f1a03f604d80157e7d69abf5..b9c203f3f089ad628ebfaac50f80cd230c1f331f 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -31,19 +31,21 @@ class wsExporter {
                $phonegap->setPlatform($os);
                $phonegap->getWWWDirectory($dir);
                if ($os == 'ios') {
-                       $phonegap->setDistantCompiler('paris.cubedesigners.com', 'vincent', '/Phonegap/Projects/' . $d, '22022');
+                       $phonegap->setDistantCompiler('paris.cubedesigners.com', 'vincent', '/Phonegap/Projects/' . $d, 22022);
                } else if ($os == 'android') {
-                       $phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', '/Phonegap/Projects/' . $d, '22322');
+                       $phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', '/Phonegap/Projects/' . $d, 22322);
                }
                $phonegap->setPreference('orientation', CubeIT_Mobile_Phonegap::ORIENTATION_PORTRAIT);
                $phonegap->setPreference('target-device', CubeIT_Mobile_Phonegap::TARGET_TABLET);
                $phonegap->setPreference('show-splash-screen-spinner', false);
                $phonegap->setPreference('auto-hide-splash-screen', false);
-               $phonegap->addFeatures(array('Device','Connection',''));
+               $phonegap->addFeatures(array('Device', 'Connection', ''));
 
-               $this->_createProject($os, $collection->nom, $collection->settings['namespace']);
-               $this->_collectionAssets($os, $compiler);
-               $this->_transfertPhonegap($os, $dir, $dest);
+               $phonegap->run();
+
+               /* $this->_createProject($os, $collection->nom, $collection->settings['namespace']);
+                 $this->_collectionAssets($os, $compiler);
+                 $this->_transfertPhonegap($os, $dir, $dest); */
        }
 
        /**
@@ -343,36 +345,9 @@ class wsExporter {
                        return;
                }
 
-               $destDistant = stristr($dest, '@');
-               if ($destDistant) {
-                       list($distServer, $distDir) = explode(':', $dest);
-               }
-
-               if (!file_exists($dest)) {
-                       if (!$destDistant) {
-                               mkdir($dest, 0777, true);
-                       } else {
-                               `ssh $distServer "mkdir -p $distDir"`;
-                       }
-               }
-
-               $cp = new cubeCommandLine('rsync');
-               $cp->setPath(CONVERTER_PATH);
-
-               $cp->setArg('t');
-               $cp->setArg('r');
-               $cp->setArg('v');
-               if ($erase) {
-                       $cp->setArg('force');
-                       $cp->setArg('delete-after');
-               }
-               if ($destDistant) {
-                       $cp->setArg('e', 'ssh');
-               }
-               $cp->setArg(null, rtrim($src, '/') . '/');
-               $cp->setArg(null, rtrim($dest, '/') . '/');
-               $cp->execute();
 
+               $cl = CubeIT_CommandLine_Rsync($src, $dest, $erase);
+               $cl->execute();
                if (!is_null($chown)) {
                        `chown -R $chown $dest`;
                }