Merge branch 'java-cef'

# Conflicts:
#	java/org/cef/browser/CefBrowser.java
#	java/org/cef/browser/CefBrowserOsr.java
#	java/org/cef/browser/CefBrowser_N.java
#	java/org/cef/browser/CefFrame.java
#	java/org/cef/browser/CefFrame_N.java
#	native/CefBrowser_N.cpp
#	native/CefFrame_N.cpp
#	native/CefFrame_N.h
#	native/util_linux.cpp
#	native/util_mac.mm
#	third_party/jogamp/jar/gluegen-rt-natives-linux-amd64.jar
#	third_party/jogamp/jar/gluegen-rt-natives-macosx-universal.jar
#	third_party/jogamp/jar/gluegen-rt-natives-windows-amd64.jar
#	third_party/jogamp/jar/gluegen-rt.jar
#	third_party/jogamp/jar/jogl-all-natives-linux-amd64.jar
#	third_party/jogamp/jar/jogl-all-natives-macosx-universal.jar
#	third_party/jogamp/jar/jogl-all-natives-windows-amd64.jar
#	third_party/jogamp/jar/jogl-all.jar
#	tools/compile.sh
#	tools/make_distrib.sh
#	tools/make_docs.sh
#	tools/run.sh
#	tools/run_tests.sh

1 files changed, 46 insertions, 54 deletions

diff --git a/tools/make_distrib.sh b/tools/make_distrib.sh
index e532076..1b66aba 100755
--- a/tools/make_distrib.sh
+++ b/tools/make_distrib.sh
@@ -6,59 +6,56 @@
 if [ -z "$1" ]; then
   echo "ERROR: Please specify a build target: linux32, linux64 or macosx64"
 else
-  cd ..
-
-  export DISTRIB_PLATFORM="$1"
-  export DISTRIB_PATH="./binary_distrib/$1"
-  export DISTRIB_BIN_PATH="$DISTRIB_PATH/bin"
-  export DISTRIB_DOCS_PATH="$DISTRIB_PATH/docs"
-  export OUT_PATH="./out"
-  export OUT_DOCS_PATH="./out/docs"
-  export SOURCE_PATH="./java"
-  export JOGAMP_PATH="./third_party/jogamp"
-  export TOOLS_DISTRIB_PATH="./tools/distrib/$1"
-  export EXCLUDE_FILE="./tools/distrib/EXCLUDE_FILES.txt"
+  DIR="$( cd "$( dirname "$0" )" && cd .. && pwd )"
+  DISTRIB_PLATFORM="$1"
+  DISTRIB_PATH="${DIR}/binary_distrib/$1"
+  DISTRIB_BIN_PATH="$DISTRIB_PATH/bin"
+  DISTRIB_DOCS_PATH="$DISTRIB_PATH/docs"
+  OUT_PATH="${DIR}/out"
+  OUT_DOCS_PATH="${DIR}/out/docs"
+  SOURCE_PATH="${DIR}/java"
+  JOGAMP_PATH="${DIR}/third_party/jogamp"
+  TOOLS_DISTRIB_PATH="${DIR}/tools/distrib/$1"
+  EXCLUDE_FILE="${DIR}/tools/distrib/EXCLUDE_FILES.txt"
 
   if [ ! -d "$DISTRIB_BIN_PATH" ]; then
     mkdir -p "$DISTRIB_BIN_PATH"
   fi
 
   # Create the JCEF documentation.
-#  cd tools
-#  ./make_docs.sh
-#  cd ..
+  #"${DIR}"/tools/make_docs.sh
 
   # Copy documentation to the docs directory.
-  cp -rf $OUT_DOCS_PATH $DISTRIB_DOCS_PATH
+  cp -rf "$OUT_DOCS_PATH" "$DISTRIB_DOCS_PATH"
 
   # Create README.txt
-  python tools/make_readme.py --output-dir $DISTRIB_PATH/ --platform $DISTRIB_PLATFORM
+  python "${DIR}"/tools/make_readme.py --output-dir "$DISTRIB_PATH/" --platform $DISTRIB_PLATFORM
 
   # Copy miscellaneous files to the root directory.
-  cp -f ./LICENSE.txt $DISTRIB_PATH
-  cp -f $JOGAMP_PATH/*.LICENSE.txt $DISTRIB_PATH
-  rsync -a --exclude-from $EXCLUDE_FILE $TOOLS_DISTRIB_PATH/ $DISTRIB_PATH/
+  cp -f "${DIR}"/LICENSE.txt "$DISTRIB_PATH"
+  cp -f "$JOGAMP_PATH"/*.LICENSE.txt "$DISTRIB_PATH"
+  rsync -a --exclude-from "$EXCLUDE_FILE" "$TOOLS_DISTRIB_PATH/" "$DISTRIB_PATH/"
 
   if [ $1 == "macosx64" ]; then
-    export OUT_BINARY_PATH="./jcef_build/native/Release"
+    OUT_BINARY_PATH="${DIR}/jcef_build/native/Release"
     if [ ! -d "$OUT_BINARY_PATH" ]; then
       echo "ERROR: Native Release build output path does not exist"
       exit 1
     fi
 
     # Copy test program source file to the tests directory.
-    cp -rf $SOURCE_PATH/tests $DISTRIB_PATH
+    cp -rf "$SOURCE_PATH"/tests "$DISTRIB_PATH"
 
     # Everything else is contained in the app bundle.
-    cp -rf $OUT_BINARY_PATH/jcef_app.app $DISTRIB_BIN_PATH
+    cp -rf "$OUT_BINARY_PATH"/jcef_app.app ""$DISTRIB_BIN_PATH
   else
-    export DISTRIB_LIB_PATH="$DISTRIB_PATH/bin/lib/$1"
-    export JOGAMP_JAR_PATH="$JOGAMP_PATH/jar"
-    export OUT_BINARY_PATH="$OUT_PATH/Release"
+    DISTRIB_LIB_PATH="$DISTRIB_PATH/bin/lib/$1"
+    JOGAMP_JAR_PATH="$JOGAMP_PATH/jar"
+    OUT_BINARY_PATH="$OUT_PATH/Release"
 
     # Alternately look in the CMake output path.
     if [ ! -d "$OUT_BINARY_PATH" ]; then
-      export OUT_BINARY_PATH="./jcef_build/native/Release"
+      OUT_BINARY_PATH="${DIR}/jcef_build/native/Release"
     fi
     if [ ! -d "$OUT_BINARY_PATH" ]; then
       echo "ERROR: Native Release build output path does not exist"
@@ -66,47 +63,42 @@ else
     fi
   
     # Create the JCEF JAR file.
-    cd tools
-    ./make_jar.sh $1
-    cd ..
+    "${DIR}"/tools/make_jar.sh $1
 
     # Copy JAR files to the bin directory.
-    cp -f $JOGAMP_JAR_PATH/gluegen-rt.jar $DISTRIB_BIN_PATH
-    cp -f $JOGAMP_JAR_PATH/jogl-all.jar $DISTRIB_BIN_PATH
+    cp -f "$JOGAMP_JAR_PATH"/gluegen-rt.jar "$DISTRIB_BIN_PATH"
+    cp -f "$JOGAMP_JAR_PATH"/jogl-all.jar "$DISTRIB_BIN_PATH"
 
     if [ $1 == "linux32" ]; then
-      export JOGAMP_JAR_SUFFIX="i586"
+      JOGAMP_JAR_SUFFIX="i586"
     else
-      export JOGAMP_JAR_SUFFIX="amd64"
+      JOGAMP_JAR_SUFFIX="amd64"
     fi
-    cp -f $JOGAMP_JAR_PATH/gluegen-rt-natives-linux-$JOGAMP_JAR_SUFFIX.jar $DISTRIB_BIN_PATH
-    cp -f $JOGAMP_JAR_PATH/jogl-all-natives-linux-$JOGAMP_JAR_SUFFIX.jar $DISTRIB_BIN_PATH
-    cp -f $OUT_PATH/$1/jcef.jar $DISTRIB_BIN_PATH
+    cp -f "$JOGAMP_JAR_PATH"/gluegen-rt-natives-linux-$JOGAMP_JAR_SUFFIX.jar "$DISTRIB_BIN_PATH"
+    cp -f "$JOGAMP_JAR_PATH"/jogl-all-natives-linux-$JOGAMP_JAR_SUFFIX.jar "$DISTRIB_BIN_PATH"
+    cp -f "$OUT_PATH"/$1/jcef.jar "$DISTRIB_BIN_PATH"
 
     # Copy test program source and JAR file to the bin directory.
-    cp -rf $SOURCE_PATH/tests $DISTRIB_BIN_PATH
-    cp -f $OUT_PATH/$1/jcef-tests.jar $DISTRIB_BIN_PATH
+    cp -rf "$SOURCE_PATH"/tests "$DISTRIB_BIN_PATH"
+    cp -f "$OUT_PATH"/$1/jcef-tests.jar "$DISTRIB_BIN_PATH"
 
     # Copy CEF Release files to the lib directory.
     if [ ! -d "$DISTRIB_LIB_PATH" ]; then
       mkdir -p "$DISTRIB_LIB_PATH"
     fi
 
-    cp -f $OUT_BINARY_PATH/chrome-sandbox $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/libjcef.so $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/jcef_helper $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/icudtl.dat $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/libcef.so $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/libEGL.so $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/libGLESv2.so $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/natives_blob.bin $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/snapshot_blob.bin $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/v8_context_snapshot.bin $DISTRIB_LIB_PATH
-    cp -f $OUT_BINARY_PATH/*.pak $DISTRIB_LIB_PATH
-    cp -rf $OUT_BINARY_PATH/locales/ $DISTRIB_LIB_PATH
-    cp -rf $OUT_BINARY_PATH/swiftshader/ $DISTRIB_LIB_PATH
+    cp -f "$OUT_BINARY_PATH"/chrome-sandbox "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/libjcef.so "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/jcef_helper "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/icudtl.dat "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/libcef.so "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/libEGL.so "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/libGLESv2.so "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/snapshot_blob.bin "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/v8_context_snapshot.bin "$DISTRIB_LIB_PATH"
+    cp -f "$OUT_BINARY_PATH"/*.pak "$DISTRIB_LIB_PATH"
+    cp -rf "$OUT_BINARY_PATH"/locales/ "$DISTRIB_LIB_PATH"
+    cp -rf "$OUT_BINARY_PATH"/swiftshader/ "$DISTRIB_LIB_PATH"
   fi
-
-  cd tools
 fi