Merge pull request #214 from zerotier/brenton/move

Move java files to com/zerotier/sockets subfolder
zerotier · May 25, 2023 · 4531b38 · 4531b38
2 parents 71c2f97 + 48adf41
commit 4531b38
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/build.sh b/build.sh
@@ -499,7 +499,7 @@ host-jar()
     BUILD_TYPE=${1:-release}
     if [[ $1 = *"docs"* ]]; then
         # Generate documentation
-        javadoc src/bindings/java/*.java -d docs/java
+        javadoc src/bindings/java/com/zerotier/sockets/*.java -d docs/java
         exit 0
     fi
     VARIANT="-DZTS_ENABLE_JAVA=True"
@@ -512,7 +512,7 @@ host-jar()
     JAVA_JAR_DIR=$CACHE_DIR/pkg/jar
     JAVA_JAR_SOURCE_TREE_DIR=$JAVA_JAR_DIR/com/zerotier/sockets/
     mkdir -p $JAVA_JAR_SOURCE_TREE_DIR
-    cp -f src/bindings/java/*.java $JAVA_JAR_SOURCE_TREE_DIR
+    cp -f src/bindings/java/com/zerotier/sockets/*.java $JAVA_JAR_SOURCE_TREE_DIR
     # Build
     $CMAKE $VARIANT -H. -B$CACHE_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE
     $CMAKE --build $CACHE_DIR $BUILD_CONCURRENCY
@@ -601,7 +601,7 @@ android-aar()
     export PATH=$ANDROID_HOME/cmdline-tools/tools/bin:$PATH
     # Copy source files into project
     mkdir -p ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets
-    cp -f src/bindings/java/*.java ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets
+    cp -f src/bindings/java/com/zerotier/sockets/*.java ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets
     # Build
     UPPERCASE_BUILD_TYPE="$(tr '[:lower:]' '[:upper:]' <<< ${BUILD_TYPE:0:1})${BUILD_TYPE:1}"
     CMAKE_FLAGS="-D${CMAKE_SWITCH}=1 -D${CMAKE_SWITCH}=ON"
@@ -652,21 +652,21 @@ format-code()
         if [[ ! $(which $CLANG_FORMAT) = "" ]];
         then
             # Eventually: find . -path ./ext -prune -false -o -type f \( -iname \*.c -o -iname \*.h -o -iname \*.cpp -o -iname \*.hpp \) -exec clang-format -i {} \;
-            $CLANG_FORMAT -i --verbose include/*.h                \
-                            src/*.c                               \
-                            src/*.cpp                             \
-                            src/*.hpp                             \
-                            examples/c/*.c                        \
-                            examples/csharp/*.cs                  \
-                            examples/java/*.java                  \
-                            test/*.c                              \
-                            test/*.cs                             \
-                            src/bindings/csharp/*.cs              \
-                            src/bindings/csharp/*.cxx             \
-                            src/bindings/java/*.java              \
-                            src/bindings/java/*.cxx               \
-                            examples/csharp/*.cs                  \
-                            src/bindings/python/PythonSockets.cxx \
+            $CLANG_FORMAT -i --verbose include/*.h                        \
+                            src/*.c                                       \
+                            src/*.cpp                                     \
+                            src/*.hpp                                     \
+                            examples/c/*.c                                \
+                            examples/csharp/*.cs                          \
+                            examples/java/*.java                          \
+                            test/*.c                                      \
+                            test/*.cs                                     \
+                            src/bindings/csharp/*.cs                      \
+                            src/bindings/csharp/*.cxx                     \
+                            src/bindings/java/com/zerotier/sockets/*.java \
+                            src/bindings/java/*.cxx                       \
+                            examples/csharp/*.cs                          \
+                            src/bindings/python/PythonSockets.cxx         \
                             src/bindings/python/PythonSocket.h
             return 0
         else

diff --git a/...bindings/java/ZeroTierDatagramSocket.java → ...otier/sockets/ZeroTierDatagramSocket.java b/...bindings/java/ZeroTierDatagramSocket.java → ...otier/sockets/ZeroTierDatagramSocket.java
diff --git a/src/bindings/java/ZeroTierEventListener.java → ...rotier/sockets/ZeroTierEventListener.java b/src/bindings/java/ZeroTierEventListener.java → ...rotier/sockets/ZeroTierEventListener.java
diff --git a/...dings/java/ZeroTierFileDescriptorSet.java → ...er/sockets/ZeroTierFileDescriptorSet.java b/...dings/java/ZeroTierFileDescriptorSet.java → ...er/sockets/ZeroTierFileDescriptorSet.java
diff --git a/src/bindings/java/ZeroTierInputStream.java → ...zerotier/sockets/ZeroTierInputStream.java b/src/bindings/java/ZeroTierInputStream.java → ...zerotier/sockets/ZeroTierInputStream.java
diff --git a/src/bindings/java/ZeroTierNative.java → .../com/zerotier/sockets/ZeroTierNative.java b/src/bindings/java/ZeroTierNative.java → .../com/zerotier/sockets/ZeroTierNative.java
diff --git a/src/bindings/java/ZeroTierNode.java → ...va/com/zerotier/sockets/ZeroTierNode.java b/src/bindings/java/ZeroTierNode.java → ...va/com/zerotier/sockets/ZeroTierNode.java
diff --git a/src/bindings/java/ZeroTierOutputStream.java → ...erotier/sockets/ZeroTierOutputStream.java b/src/bindings/java/ZeroTierOutputStream.java → ...erotier/sockets/ZeroTierOutputStream.java
diff --git a/src/bindings/java/ZeroTierPeerDetails.java → ...zerotier/sockets/ZeroTierPeerDetails.java b/src/bindings/java/ZeroTierPeerDetails.java → ...zerotier/sockets/ZeroTierPeerDetails.java
diff --git a/src/bindings/java/ZeroTierServerSocket.java → ...erotier/sockets/ZeroTierServerSocket.java b/src/bindings/java/ZeroTierServerSocket.java → ...erotier/sockets/ZeroTierServerSocket.java
diff --git a/src/bindings/java/ZeroTierSocket.java → .../com/zerotier/sockets/ZeroTierSocket.java b/src/bindings/java/ZeroTierSocket.java → .../com/zerotier/sockets/ZeroTierSocket.java
diff --git a/src/bindings/java/ZeroTierSocketAddress.java → ...rotier/sockets/ZeroTierSocketAddress.java b/src/bindings/java/ZeroTierSocketAddress.java → ...rotier/sockets/ZeroTierSocketAddress.java