move src directories

Author: joeferner

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/devcontainers/javascript-node:22
 
 RUN apt-get update
-RUN apt-get install -y openjdk-17-jdk gdb clang-format
+RUN apt-get install -y openjdk-17-jdk maven gdb clang-format

.vscode/settings.json

@@ -4,6 +4,7 @@
         "clazzclazz",
         "Ferner",
         "jarray",
+        "javac",
         "jboolean",
         "jbyte",
         "jchar",

README.md

@@ -13,13 +13,13 @@
         'target_arch': 's390'
       }],
       ['OS=="win"', {
-        'javahome%': '<!(node findJavaHome.js)'
+        'javahome%': '<!(node ./scripts/findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
-        'javahome%': '<!(node findJavaHome.js)'
+        'javahome%': '<!(node ./scripts/findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
-        'javalibdir%': "<!(./find_java_libdir.sh <(target_arch) <(OS))"
+        'javalibdir%': "<!(./scripts/find_java_libdir.sh <(target_arch) <(OS))"
       }],
       ['OS=="zos"', {
         'nodever%': '<!(node -e "console.log(process.versions.node)" | cut -d"." -f1)'
@@ -30,12 +30,12 @@
     {
       'target_name': 'nodejavabridge_bindings',
       'sources': [
-        'src/java.cpp',
-        'src/javaObject.cpp',
-        'src/javaScope.cpp',
-        'src/methodCallBaton.cpp',
-        'src/nodeJavaBridge.cpp',
-        'src/utils.cpp'
+        'src-cpp/java.cpp',
+        'src-cpp/javaObject.cpp',
+        'src-cpp/javaScope.cpp',
+        'src-cpp/methodCallBaton.cpp',
+        'src-cpp/nodeJavaBridge.cpp',
+        'src-cpp/utils.cpp'
       ],
       'include_dirs': [
         '<(javahome)/include',

binding.gyp

@@ -1 +1 @@
-module.exports = require("./lib/nodeJavaBridge");
+module.exports = require("./src-node/nodeJavaBridge");

compile-java.sh

@@ -43,11 +43,12 @@
   },
   "scripts": {
     "install": "node-gyp rebuild",
-    "test": "node testRunner.js",
-    "postinstall": "node postInstall.js",
+    "clean": "rm -rf build",
+    "test": "node ./scripts/testRunner.js",
+    "postinstall": "node ./scripts/postInstall.js",
     "lint": "eslint --ext js,ts,tsx --report-unused-disable-directives --max-warnings 0 .",
     "format": "prettier --write .",
-    "format-cpp": "clang-format --version; find src/ -iname '*.h' -o -iname '*.cpp' | xargs clang-format -i",
+    "format-cpp": "clang-format --version; find src-cpp/ -iname '*.h' -o -iname '*.cpp' | xargs clang-format -i",
     "precommit": "npm run format-cpp && npm run format && npm run lint && npm test"
   },
   "main": "./index.js"

index.js

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -eu
+
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
+if [ -z "${JAVA_HOME:-}" ] && [ -e "/usr/libexec/java_home" ]; then
+    export JAVA_HOME=$(/usr/libexec/java_home -v 11)
+fi
+
+echo "Using $(javac -version)."
+set -x
+
+javac -source 1.8 -target 1.8 src-java/node/*.java
+javac -source 1.8 -target 1.8 test/*.java
+javac -classpath src-java -h ./src-cpp src-java/node/NodeDynamicProxyClass.java
+echo "complete!"