(no commit message)

diff --git a/fluidbook/compile/_zinc/send.bat b/fluidbook/compile/_zinc/send.bat
index bb95bafab0a30926171d327d3f72d549cd2e866c..064b15b1d7abd7ac4b7971e0589cee2800e58ecc 100644 (file)
--- a/fluidbook/compile/_zinc/send.bat
+++ b/fluidbook/compile/_zinc/send.bat
@@ -1,4 +1,4 @@
 rm Fluidbook.app.zip\r
 "C:\Program Files\7-Zip\7z.exe" a -tzip Fluidbook.app.zip Fluidbook.app\r
-"H:\Applications\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.exe" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/\r
-"H:\Applications\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.app.zip" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
\ No newline at end of file
+"H:\Applications\PortableApps\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.exe" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/\r
+"H:\Applications\PortableApps\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.app.zip" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
\ No newline at end of file

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 9254efe5a612432a8e01777f420d93d0628f0c6e..8de9f9553810cea82550e0f5732e77b7cdc6b316 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -61,8 +61,18 @@ class wsExporter {
                                )
                );
 
-               $full = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true';
-               $phonegap->run($full);
+               $ctrl = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true';
+               $alt = isset($_GET['alt']) && $_GET['alt'] == 'true';
+
+               $run = CubeIT_Mobile_Phonegap::RUN_SYNC;
+               if ($ctrl) {
+                       $run = CubeIT_Mobile_Phonegap::RUN_RUN;
+                       if ($alt) {
+                               $run = CubeIT_Mobile_Phonegap::RUN_CREATE;
+                       }
+               }
+
+               $phonegap->run($run);
 
                /* $this->_createProject($os, $collection->nom, $collection->settings['namespace']);
                  $this->_collectionAssets($os, $compiler);

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 99ab3b2341ac92712c132afcf4041a393139d44b..f36343b8db4fbcff7cb2804070c4f44567d22886 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -808,7 +808,7 @@ class wsHTML5Compiler {
                $this->config->phonegap = $this->phonegap;
                $this->config->retinaResolution = $this->maxRes;
                if ($this->home) {
-                       $this->config->home = '%apphome%';
+                       $this->config->home = 'http://home';
                }
                $this->config->multiApp = $this->multiApp;
                foreach ($this->additionalConfig as $k => $v) {