#819

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 2ae40c71b735603ea9dcaf8f368cd5b9d43977f6..3a8ef1c1151afc3beb890ab8752e119253882f1f 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1732,7 +1732,7 @@ class wsHTML5Compiler {
 
 
        public function unzipFile($file, $moveAssets = false, $baseDir = null) {
-               $fdir = is_null($baseDir) ? 'data/links/' . $file : $baseDir;
+               $fdir = is_null($baseDir) ? 'data/links/' . str_replace('.', '_', $file) : $baseDir;
 
                $tmp = CubeIT_Files::tmpdir();
                $dir = $tmp . '/' . $fdir;

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 14ada3252404224d4d6d76c64cf4ed6bed9b6af4..45528e9e4f14ae48d3a2cb3eb6d2df7322ebba0a 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
@@ -6,7 +6,7 @@ class wsPackagerWinEXEHTML extends wsPackager {
        protected $appName;\r
        protected $buildPath;\r
        protected $nwplatform = 'windows-x32';\r
-       protected $nwversion = '0.29.0';\r
+       protected $nwversion = '0.29.2';\r
        protected $appversion = '';\r
 \r
        public function __construct($book_id) {\r
@@ -32,11 +32,8 @@ class wsPackagerWinEXEHTML extends wsPackager {
                $this->makeJSON();\r
 \r
                $this->buildPath = WS_PACKAGER . '/nwbuild/' . $this->version . '/' . $this->book_id;\r
-               if (!file_exists($this->buildPath)) {\r
-                       mkdir($this->buildPath . '/win32/', 0777, true);\r
-               }\r
 \r
-               `rm -rf /home/extranetfiles/tmp/webexectemp/$this->appName.nwf/`;\r
+               //`rm -rf /home/extranetfiles/tmp/webexectemp/$this->appName.nwf/`;\r
 \r
                $cl = new CubeIT_CommandLine('/usr/local/web2exe/web2exe-linux');\r
                $cl->setPath(CONVERTER_PATH);\r
@@ -47,7 +44,7 @@ class wsPackagerWinEXEHTML extends wsPackager {
                $cl->setArg('title', $this->appName);\r
                $cl->setArg('output-dir', $this->buildPath);\r
                $cl->setArg('nw-version', $this->nwversion);\r
-               $cl->setArg('sdk-build');\r
+               //$cl->setArg('sdk-build');\r
                $cl->setArg('main', 'index.html');\r
                $cl->setArg('name', $this->exeName);\r
                $cl->setArg('mac-icon', $this->vdir . 'icon.icns');\r
@@ -62,47 +59,8 @@ class wsPackagerWinEXEHTML extends wsPackager {
                $cl->setArg(null, $this->vdir);\r
                $cl->execute();\r
                $cl->debug();\r
-\r
-               //              $this->compileShortcut();\r
-\r
        }\r
 \r
-       //      function compileShortcut() {\r
-       //              $tmp = CubeIT_Files::tmpdir();\r
-       //\r
-       //              $files = array('fluidbook.cpp', 'fluidbook.rc');\r
-       //              $vars = array('icofile' => $this->vdir . '/icon.ico',\r
-       //                            'exename' => $this->exeName,\r
-       //                            'platform' => $this->nwplatform,\r
-       //                            'appversion' => $this->appversion,\r
-       //                            'appname' => $this->appName);\r
-       //              foreach ($files as $file) {\r
-       //                      $c = file_get_contents(WS_COMPILE_ASSETS . '/_exehtml/exeshortcut/' . $file);\r
-       //                      foreach ($vars as $k => $v) {\r
-       //                              $c = str_replace('$' . $k, $v, $c);\r
-       //                      }\r
-       //                      file_put_contents($tmp . '/' . $file, $c);\r
-       //              }\r
-       //\r
-       //              $cl = new CubeIT_CommandLine('i686-w64-mingw32-windres');\r
-       //              $cl->setPath(CONVERTER_PATH);\r
-       //              $cl->setArg(null, $tmp . '/fluidbook.rc');\r
-       //              $cl->setArg('O', 'coff');\r
-       //              $cl->setArg('o', $tmp . '/fluidbook.res');\r
-       //              $cl->execute();\r
-       //              $cl->debug();\r
-       //\r
-       //              $cl = new CubeIT_CommandLine('i686-w64-mingw32-g++');\r
-       //              $cl->setPath(CONVERTER_PATH);\r
-       //              $cl->setManualArg('-lmingw32');\r
-       //              $cl->setManualArg('-mwindows');\r
-       //              $cl->setArg('o', $this->buildPath . '/' . $this->exeName . '/' . $this->exeName . '.exe');\r
-       //              $cl->setArg(null, $tmp . '/fluidbook.cpp');\r
-       //              $cl->setArg(null, $tmp . '/fluidbook.res');\r
-       //              $cl->execute();\r
-       //              $cl->debug();\r
-       //      }\r
-\r
        function makeJSON() {\r
                $data = ['app_name' => $this->appName, 'main' => 'index.html', 'name' => $this->exeName, 'version' => '1.0.' . time(),\r
                         'webkit' => [],\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 813d99e3e8a8ff710e78d17edfadd2caf8203781..6c20d46b39b6da21b8005895a950724273a76ed9 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
@@ -3,7 +3,7 @@
 class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML {\r
 \r
        protected $nsi;\r
-       protected $nsifile='html';\r
+       protected $nsifile = 'html';\r
 \r
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
@@ -36,7 +36,7 @@ class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML {
                $fname = $this->exeName;\r
                $title = $this->appName;\r
 \r
-               $nsi = file_get_contents(WS_COMPILE_ASSETS . '/'.$this->nsifile.'.nsi');\r
+               $nsi = file_get_contents(WS_COMPILE_ASSETS . '/' . $this->nsifile . '.nsi');\r
                $nsi = str_replace('$name', utf8_decode($title), $nsi);\r
                $nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi);\r
                $nsi = str_replace('$fname', $fname, $nsi);\r