Merge branch 'master' of https://github.com/nativelibs4java/BridJ

Author: ochafik

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "(lldb) Launch",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "/usr/local/opt/openjdk@11/bin/java",
+      "args": [
+        "-cp",
+        // mvn dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=deps-classpath-test.txt
+        // + target/generated-resources:target/generated-test-resources:target/test-classes:target/classes
+        "${workspaceFolder}/target/generated-resources:${workspaceFolder}/target/generated-test-resources:${workspaceFolder}/target/test-classes:${workspaceFolder}/target/classes:/Users/ochafik/.m2/repository/com/google/android/tools/dx/1.7/dx-1.7.jar:/Users/ochafik/.m2/repository/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1.jar:/Users/ochafik/.m2/repository/org/json/json/20080701/json-20080701.jar:/Users/ochafik/.m2/repository/junit/junit/4.13.2/junit-4.13.2.jar:/Users/ochafik/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/Users/ochafik/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/Users/ochafik/.m2/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar:/Users/ochafik/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar:/Users/ochafik/.m2/repository/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar:/Users/ochafik/.m2/repository/javolution/javolution/5.5.1/javolution-5.5.1.jar:/Users/ochafik/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar:/Users/ochafik/.m2/repository/net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar:/Users/ochafik/.m2/repository/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar:/Users/ochafik/.m2/repository/org/ow2/asm/asm/9.4/asm-9.4.jar:/Users/ochafik/.m2/repository/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar:/Users/ochafik/.m2/repository/com/google/android/android/4.1.1.4/android-4.1.1.4.jar",
+        "org.junit.runner.JUnitCore",
+        "org.bridj.BridJTest"
+      ],
+      "stopAtEntry": false,
+      "cwd": "${fileDirname}",
+      "environment": [],
+      "externalConsole": false,
+      // "MIMode": "gdb",
+      "MIMode": "lldb"
+    }
+  ]
+}

BuildNative

@@ -1,9 +1,6 @@
 #!/bin/bash
-
-function failed() {
-	echo "$@"
-	exit 1
-}
+set -eu
+# set -x
 
 cd `dirname $0`
 BASE_DIR=$PWD
@@ -17,28 +14,24 @@ then
 fi
 
 cd $DYNCALL_HOME
-hg diff > $DYNCALL_DIFF
+if which hg 2>/dev/null ; then
+	hg diff > $DYNCALL_DIFF
+fi
 cd $BASE_DIR
 
-MAKE_CMD=make
-if [[ "`which gmake`" != "" ]]; then
-	MAKE_CMD=gmake
-fi
 
 UNAME_ARCH=`uname -m`
 UNAME_OS=`uname -s | sed s/_NT-.*/_NT/`
 
 function get_arch() {
-    if [[ -n "$ARCH" ]]; then
-        echo "$ARCH"
-    elif [[ "$UNAME_OS" == "SunOS" ]]; then
+    if [[ "$UNAME_OS" == "SunOS" ]]; then
         if [ "`isainfo -n`" = "amd64" ]; then
 		    echo "x64"
 	    else
 		    echo "x86"
 	    fi
-    elif [[ "$UNAME_OS" == "Darwin" ]]; then
-	    echo "universal"
+    # elif [[ "$UNAME_OS" == "Darwin" ]]; then
+	  #   echo "universal"
     else
         case $UNAME_ARCH in
         i86pc|i386|i486|i586|i686|x86)
@@ -47,11 +40,17 @@ function get_arch() {
         x86_64|amd64)
 	        echo x64
 	        ;;
+				aarch64)
+					echo arm64
+					;;
         arm*)
 			    if [[ -d /lib/arm-linux-gnueabihf ]] ; then
-	        	echo "armhf"
+	        	# echo "armhf"
+						# echo "arm32v7"
+						echo "arm"
 	        elif [[ -d /lib/arm-linux-gnueabi ]] ; then
 	        	echo "armel"
+						# echo "arm32v5"
     	    else
     		    failed "Unknown Linux arm flavour: please edit $0 and Platform.java"
 	        fi
@@ -86,94 +85,130 @@ function get_os() {
     esac
 }
 
+function build_libraries() {
+	local OS="$1"
+	local ARCH="$2"
+	shift 2
 
-function get_os_arch() {
-    case $OS in
-    windows)
-	    case $ARCH in
-	    x86)
-	        echo win32
-	        ;;
-	    x64)
-	        echo win64
-	        ;;
-	    esac
-	    ;;
-    *)
-        echo ${OS}_${ARCH}
-        ;;
-    esac
-}
+	local CMAKE_FLAGS=( "$@" )
+	local RESOURCES=()
+	local TEST_RESOURCES=()
+
+	# if [[ "${FAST:-0}" != "1" ]]; then
+	# 	mvn generate-sources
+	# fi
 
-CMDS=$@
-if [[ -z "$BRIDJ_TARGETS" ]]; then
-	BRIDJ_TARGETS="default"
-	if [[ -n "$ANDROID_NDK_HOME" ]] ; then
-		BRIDJ_TARGETS="$BRIDJ_TARGETS android" ;
+	if [[ "$OS" == "android" ]]; then
+		$BASE_DIR/src/main/cpp/bridj/MakeAndroid.sh $@
+		return 0
 	fi
-fi
 
-if [[ "$1" != "clean" && "$FAST" != "1" ]]; then
-    mvn generate-sources
-fi
+	if [[ "${DEBUG:-0}" == "1" ]]; then
+		CMAKE_FLAGS+=( -DCMAKE_BUILD_TYPE=Debug )
+	else
+		CMAKE_FLAGS+=( -DCMAKE_BUILD_TYPE=Release )
+	fi
 
-function build_libraries() {
-    export NATIVE_ARCH=`ARCH="" get_arch`
-    export ARCH=`get_arch`
-    export OS_ARCH=`get_os_arch`
-   
-    for BRIDJ_TARGET in $BRIDJ_TARGETS ; do
-	    case $BRIDJ_TARGET in
-	    default)
-		    cd $DYNCALL_HOME
-		    local DYNCALL_CONFIGURE_ARGS=""
-		    if [[ "$ARCH" != "$NATIVE_ARCH" ]]; then
-		        DYNCALL_CONFIGURE_ARGS="--target-$ARCH"
-        fi
-		    sh ./configure $DYNCALL_CONFIGURE_ARGS
-		    $MAKE_CMD $@ || failed "Failed building dyncall"
-
-		    export DYNCALL_HOME
-		    export OS
-		    export ARCH
-		    export CONFIG
-		    export OUT_DIR=$BASE_DIR/src/main/resources/org/bridj/lib/$OS_ARCH
-		    export OBJ_DIR=target/build/${OS}_${ARCH}_${CONFIG}
-		    export DYNCALL_BUILD_DIR=build_out/${OS}_${ARCH}_gcc_${CONFIG}
-
-		    cd $BASE_DIR/src/main/cpp/bridj
-		    $MAKE_CMD $@ || failed "Build of lib failed"
-
-		    export OUT_DIR=$BASE_DIR/src/test/resources/org/bridj/lib/$OS_ARCH
-
-		    cd $BASE_DIR/src/test/cpp/test
-		    $MAKE_CMD $@ || failed "Build of test lib failed"
-
-		    cd $BASE_DIR/src/test/cpp/dependsOnTest
-		    $MAKE_CMD $@ || failed "Build of dependsOnTest lib failed"
-		    ;;
-	    android)
-		    $BASE_DIR/src/main/cpp/bridj/MakeAndroid.sh $@
-		    ;;
-	    esac
-    done
-}
+	case "$OS" in
+		windows)
+			# CMAKE_FLAGS+=( -G "Visual Studio 17 2022" )
+			# case "$ARCH" in
+			# 	x86)
+			# 		CMAKE_FLAGS+=( -A Win32 )
+			# 		;;
+			# 	x64)
+			# 		CMAKE_FLAGS+=( -A x64 )
+			# 		;;
+			# 	arm)
+			# 		CMAKE_FLAGS+=( -A ARM )
+			# 		;;
+			# 	arm64)
+			# 		CMAKE_FLAGS+=( -A ARM64 )
+			# 		;;
+			# 	*)
+			# 		echo "Unknown arch: $ARCH" >&2
+			# 		exit 1
+			# esac
+			RESOURCES+=( bridj.dll )
+			TEST_RESOURCES+=( test.dll dependsOnTest.dll )
+			;;
+		darwin)
+			case "$ARCH" in
+				x64)
+					CMAKE_FLAGS+=( -DCMAKE_OSX_ARCHITECTURES=x86_64 )
+					;;
+				arm64)
+					CMAKE_FLAGS+=( -DCMAKE_OSX_ARCHITECTURES=arm64 )
+					;;
+				universal)
+					echo "WARNING: Universal builds don't work yet as JDK does not have fat binaries"
+					CMAKE_FLAGS+=( -DCMAKE_OSX_ARCHITECTURES="x86_64 arm64" )
+					;;
+			esac
+			RESOURCES+=( libbridj.dylib )
+			TEST_RESOURCES+=( libtest.dylib libdependsOnTest.dylib )
+			;;
+		*)
+			RESOURCES+=( libbridj.so )
+			TEST_RESOURCES+=( libtest.so libdependsOnTest.so )
+			;;
+	esac
+
+	OS_ARCH=${OS}_${ARCH}
+	OUT=$BASE_DIR/target/$OS_ARCH
+	if [[ "${DEBUG:-0}" == "1" ]]; then
+		OUT="${OUT}_debug"
+	fi
 
-export OS=`get_os`
+	echo "# Building for $OS on $ARCH into $OUT with cmake flags ${CMAKE_FLAGS[*]}"
 
-if [[ "$DEBUG" == "1" ]]; then
-	CONFIG=debug
-else
-	CONFIG=release
+	mkdir -p $OUT
+	cd $OUT
+	if [[ "${CMAKE:-1}" != "0" ]]; then
+		cmake ../.. "${CMAKE_FLAGS[@]}"
+	fi
+
+	# TODO: Different command for VS build on Windows
+	make -j10
+
+	echo "Copying resources for $OS_ARCH"
+	# RESOURCES_DEST=$BASE_DIR/target/classes/org/bridj/lib/$OS_ARCH
+	# TEST_RESOURCES_DEST=$BASE_DIR/target/test-classes/org/bridj/lib/$OS_ARCH
+	# RESOURCES_DEST=$BASE_DIR/target/generated-resources/org/bridj/lib/$OS_ARCH
+	# TEST_RESOURCES_DEST=$BASE_DIR/target/generated-test-resources/org/bridj/lib/$OS_ARCH
+	RESOURCES_DEST=$BASE_DIR/src/main/resources/org/bridj/lib/$OS_ARCH
+	TEST_RESOURCES_DEST=$BASE_DIR/src/test/resources/org/bridj/lib/$OS_ARCH
+
+	mkdir -p "$RESOURCES_DEST"
+	mkdir -p "$TEST_RESOURCES_DEST"
+	cp "${RESOURCES[@]}" "$RESOURCES_DEST"
+	cp "${TEST_RESOURCES[@]}" "$TEST_RESOURCES_DEST"
+}
+
+if [[ -z "${OS:-}" ]]; then
+	OS="$(get_os)"
 fi
 
-if [[ $OS =~ sunos ]]; then
-    ARCH=x86 build_libraries $@
-    ARCH=x64 build_libraries $@
+if [[ "${ARCH:-}" == "all" ]]; then
+	case $OS in
+		sunos)
+			build_libraries sunos x86 "$@"
+			build_libraries sunos x64 "$@"
+			;;
+		windows)
+			# See README.md on how to download the JDKs needed here
+			build_libraries windows x64 -DFORCE_JAVA_HOME=${JAVA_HOME_X64} "$@"
+			build_libraries windows arm64 -DFORCE_JAVA_HOME=${JAVA_HOME_ARM64} "$@"
+			;;
+		darwin)
+			build_libraries darwin x64 -DFORCE_JAVA_HOME=${JAVA_HOME_X64} "$@"
+			build_libraries darwin arm64 -DFORCE_JAVA_HOME=${JAVA_HOME_ARM64} "$@"
+			;;
+		*)
+			ARCH="$(get_arch)"
+			build_libraries $OS $ARCH "$@"
+	esac
 else
-    if [[ $OS =~ darwin ]]; then
-      export AS=llvm-as
-      export CC=llvm-gcc
-    fi
-    build_libraries $@
+	ARCH=${ARCH:-$(get_arch)}
+	build_libraries $OS $ARCH "$@"
 fi

CMakeLists.txt

@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.18.0)
+project(BridJ C CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  enable_language(OBJC)
+endif()
+
+# INTERPROCEDURAL_OPTIMIZATION
+cmake_policy(SET CMP0069 NEW) 
+set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  set(CMAKE_SHARED_LIBRARY_PREFIX "") 
+else()
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif()
+
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+option(BUILD_TESTS "Whether to build tests" ON)
+
+add_subdirectory(dyncall)
+add_subdirectory(src/main/cpp/bridj)
+add_subdirectory(src/test/cpp/test) #  EXCLUDE_FROM_ALL
+add_subdirectory(src/test/cpp/dependsOnTest)
+add_subdirectory(Examples/BasicExample/src/main/native/example)

Examples/BasicExample/pom.xml

@@ -9,8 +9,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.5</maven.compiler.source>
-		<maven.compiler.target>1.5</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
 		<bridj.version>0.7.1-SNAPSHOT</bridj.version>
 	</properties>
 

Examples/BasicExample/src/main/native/example/CMakeLists.txt

@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.18.0)
+project(BridJ-example)
+
+# if ("${FORCE_JAVA_HOME}" STREQUAL "")
+#   find_package(JNI REQUIRED)
+# else()
+#   SET(JNI_INCLUDE_DIRS
+#       ${FORCE_JAVA_HOME}/include
+#       ${FORCE_JAVA_HOME}/include/linux
+#       ${FORCE_JAVA_HOME}/include/solaris
+#       ${FORCE_JAVA_HOME}/include/windows
+#       ${FORCE_JAVA_HOME}/include/win32
+#       ${FORCE_JAVA_HOME}/include/darwin
+#   )
+#   set(JNI_LIBRARIES ${FORCE_JAVA_HOME}/lib/server/libjvm.dylib)
+# endif()
+# include_directories(${JNI_INCLUDE_DIRS})
+
+include_directories(include)
+
+add_compile_options( -fPIC )
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  add_compile_options( -stdlib=libc++ )
+endif()
+
+add_link_options(-l stdc++)
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  # http://gcc.gnu.org/onlinedocs/gcc/Solaris-2-Options.html
+  add_link_options(-mimpure-text)
+endif()
+
+add_library(example SHARED example.cpp)
+target_link_libraries(example PRIVATE ${JNI_LIBRARIES})