fix #2390 @1.5

diff --git a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll
new file mode 100644 (file)
index 0000000..5e47096
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..e7a330f
Binary files /dev/null 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 36f94e9c5d280a04fb60ea0ff250da985de5c588..efe32354262871fbdc130114624b675c47607cea 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
@@ -64,9 +64,26 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
                $cl->execute();\r
                $cl->debug();\r
 \r
+               $this->replaceFFMpeg();\r
+\r
                $this->signApp();\r
        }\r
 \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
+       }\r
+\r
        protected function signApp()\r
        {\r
                $local_root = '/Sign/';\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 f33c43c56ab91895ca3936b8e866e8a7931d50f4..1fc5b140a100af6947da7b4e162b2b2ce3e41530 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
@@ -36,8 +36,6 @@ class wsPackagerWinEXEHTML extends wsPackager
 \r
                $this->buildPath = WS_PACKAGER . '/nwbuild/' . $this->version . '/' . $this->book_id;\r
 \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
                $cl->setEnv('TMPDIR', '/home/extranetfiles/tmp');\r
@@ -62,6 +60,13 @@ class wsPackagerWinEXEHTML extends wsPackager
                $cl->setArg(null, $this->vdir);\r
                $cl->execute();\r
                $cl->debug();\r
+\r
+               $this->replaceFFMpeg();\r
+       }\r
+\r
+       function replaceFFMpeg()\r
+       {\r
+               copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/ffmpeg.dll', $this->getFinalPackageDir() . '/ffmpeg.dll');\r
        }\r
 \r
        function makeJSON()\r