From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 4 Dec 2018 13:50:12 +0000 (+0000)
Subject: fix #2390 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a0a8a6d510d94758d398c2c9b9a9b4af9f6dbf4d;p=cubeextranet.git

fix #2390 @1.5
---

diff --git a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll
new file mode 100644
index 000000000..5e4709653
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
index 000000000..e7a330f6e
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 36f94e9c5..efe323542 100644
--- 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();
 		$cl->debug();
 
+		$this->replaceFFMpeg();
+
 		$this->signApp();
 	}
 
+	function replaceFFMpeg()
+	{
+		$v = $this->getAppPath() . '/Contents/Versions/';
+		$dr = opendir($v);
+		while ($f = readdir($dr)) {
+			if ($f == '.' || $f == '..') {
+				continue;
+			}
+			$path = $v . '/' . $f;
+			if (is_dir($path)) {
+				copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/libffmpeg.dylib', $path . '/libffmpeg.dylib');
+			}
+		}
+	}
+
 	protected function signApp()
 	{
 		$local_root = '/Sign/';
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 f33c43c56..1fc5b140a 100644
--- 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
 
 		$this->buildPath = WS_PACKAGER . '/nwbuild/' . $this->version . '/' . $this->book_id;
 
-		//`rm -rf /home/extranetfiles/tmp/webexectemp/$this->appName.nwf/`;
-
 		$cl = new CubeIT_CommandLine('/usr/local/web2exe/web2exe-linux');
 		$cl->setPath(CONVERTER_PATH);
 		$cl->setEnv('TMPDIR', '/home/extranetfiles/tmp');
@@ -62,6 +60,13 @@ class wsPackagerWinEXEHTML extends wsPackager
 		$cl->setArg(null, $this->vdir);
 		$cl->execute();
 		$cl->debug();
+
+		$this->replaceFFMpeg();
+	}
+
+	function replaceFFMpeg()
+	{
+		copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/ffmpeg.dll', $this->getFinalPackageDir() . '/ffmpeg.dll');
 	}
 
 	function makeJSON()