Merge pull request #3177 from ritzalam/embed-javacpp-into-webapp

Make starting of webstart app faster

bbb-screenshare/app/jws/screenshare.jnlp

@@ -16,23 +16,23 @@
     </resources>
 
     <resources os="Windows" arch="amd64">
-        <nativelib href="ffmpeg-windows-x86_64.jar" download="eager"/>
+        <nativelib href="ffmpeg-windows-x86_64.jar"/>
     </resources>
 
     <resources os="Windows" arch="x86">
-        <nativelib href="ffmpeg-windows-x86.jar" download="eager"/>
+        <nativelib href="$$jnlpUrl/lib/ffmpeg-windows-x86.jar"/>
     </resources>
 
     <resources os="Linux" arch="x86_64 amd64">
-        <nativelib href="ffmpeg-linux-x86_64.jar" download="eager"/>
+        <nativelib href="ffmpeg-linux-x86_64.jar"/>
     </resources>
 
     <resources os="Linux" arch="x86 i386 i486 i586 i686">
-        <nativelib href="ffmpeg-linux-x86.jar" download="eager"/>
+        <nativelib href="ffmpeg-linux-x86.jar"/>
     </resources>
 
     <resources os="Mac OS X">
-        <nativelib href="ffmpeg-macosx-x86_64.jar" download="eager"/>
+        <nativelib href="ffmpeg-macosx-x86_64.jar"/>
     </resources>
 
     <application-desc

bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/s.sh

@@ -0,0 +1,18 @@
+FFMPEG=ffmpeg-3.0.2-1.2-windows-x86.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-windows-x86.jar
+SRC_DIR=src
+if [ -d "$SRC_DIR" ]; then
+  rm -rf src
+  mkdir -p src/main/resources
+fi
+cd workdir
+jar xvf ffmpeg-windows-x86.jar
+cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+ant sign-jar
+cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../app/jws/lib/ffmpeg-windows-x86.jar
+rm -rf src
+

bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh

@@ -1,16 +1,16 @@
 FFMPEG=ffmpeg-3.0.2-1.2-windows-x86.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-windows-x86.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-windows-x86.jar
-cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
+#mkdir workdir
+#cp $FFMPEG workdir/ffmpeg-windows-x86.jar
+#rm -rf src
+#mkdir -p src/main/resources
+#mkdir -p src/main/java
+#cd workdir
+#jar xvf ffmpeg-windows-x86.jar
+#cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
+#cd ..
+#rm -rf workdir
+#gradle jar
+cp $FFMPEG build/libs/ffmpeg-windows-x86-0.0.1.jar 
 ant sign-jar
 cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../app/jws/lib/ffmpeg-windows-x86.jar
-rm -rf src
 

bbb-screenshare/jws/webstart/build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-  compile ":javacpp:@jar"
+//  compile ":javacpp:@jar"
   compile ":ffmpeg:@jar"
 //  compile ":javacv:@jar"
 }

bbb-screenshare/jws/webstart/build.sh

@@ -1,6 +1,10 @@
+if [ -d "lib" ]; then
+  rm -rf lib
+fi
 mkdir lib
 cp ../../app/jws/lib/*.jar lib
 rm lib/javacv.jar
+rm lib/javacpp.jar
 gradle clean
 gradle jar
 ant sign-jar

bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/ScreenSharerRunner.java

@@ -22,7 +22,6 @@
 import java.io.IOException;
 
 import org.bigbluebutton.screenshare.client.javacv.FfmpegScreenshare;
-import org.bigbluebutton.screenshare.client.javacv.JavaCVScreenshare;
 
 public class ScreenSharerRunner {
   public static final String NAME = "SCREENSHARERUNNER: ";
@@ -64,7 +63,7 @@ public void startSharing() {
     } catch (InterruptedException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
-    } catch (org.bigbluebutton.screenshare.client.javacv.BBBFrameRecorder.Exception e) {
+    } catch (Exception e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
     }