wip #4035 @1

diff --git a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll
index 5e4709653c700630759cc72348d703784f9fecbe..c7f0bc6666cb632d65150c3d366a6f6f1b05f424 100644 (file)
Binary files a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll and b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll differ

diff --git a/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib b/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib
index e7a330f6ea02c9ff113385f03bf96cfb636f6ac4..03951a7b5f579809a95be3c3aee577d0c93d2693 100644 (file)
Binary files a/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib and b/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib differ

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 d5fe9493c3a4b49597c401853d0e000bfb5f538a..00b7930673721a7e99ff351032ad88e52b2342eb 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
@@ -3,7 +3,7 @@
 class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML\r
 {\r
     protected $nwplatform = 'osx64';\r
-    protected $nwversion = '0.29.0';\r
+    //protected $nwversion = '0.49.2';\r
     protected $node_platform = 'mac';\r
     protected $exenameMaxlength = 28;\r
 \r
@@ -11,13 +11,12 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
     {\r
         parent::__construct($book_id);\r
         $this->version = 'mac-exe-html';\r
-\r
     }\r
 \r
     public function makePackage($zip)\r
     {\r
         $this->preparePackage();\r
-        $toDelete = ['chromedriver', 'credits.html', 'minidump_stackwalk', 'nwjc', 'payload', 'v8_context_snapshot.bin', 'natives_blob.bin'];\r
+        $toDelete = ['chromedriver', 'credits.html', 'minidump_stackwalk', 'nwjc', 'payload', 'v8_context_snapshot.bin', 'natives_blob.bin','libffmpeg.dylib'];\r
         foreach ($toDelete as $item) {\r
             $p = $this->getFinalPackageDir() . '/' . $item;\r
             `rm -rf "$p"`;\r
@@ -71,17 +70,7 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
 \r
     function replaceFFMpeg()\r
     {\r
-        $v = $this->getAppPath() . '/Contents/Versions/';\r
-        $dr = opendir($v);\r
-        while ($f = readdir($dr)) {\r
-            if ($f == '.' || $f == '..') {\r
-                continue;\r
-            }\r
-            $path = $v . '/' . $f;\r
-            if (is_dir($path)) {\r
-                copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/libffmpeg.dylib', $path . '/libffmpeg.dylib');\r
-            }\r
-        }\r
+        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

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 06fc3800fa797cc90214641c7aedac4bdf9864ba..a381129ffc59bf93ad80d945f644da9e84447c74 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -243,16 +243,6 @@ class wsPackager
                }
        }
 
-       protected function moveDatasSWF()
-       {
-               if (file_exists($this->vdir . '/FluidbookDatas.swf')) {
-                       rename($this->vdir . '/FluidbookDatas.swf', $this->vdir . '/data/FluidbookDatas.swf');
-               }
-               if (file_exists($this->vdir . '/FluidbookDatasLight.swf')) {
-                       rename($this->vdir . '/FluidbookDatasLight.swf', $this->vdir . '/data/FluidbookDatasLight.swf');
-               }
-       }
-
        protected function postPackage()
        {