gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #214 from zerotier/brenton/move

Browse Source 
Move java files to com/zerotier/sockets subfolder
This commit is contained in:
Joseph Henry
2023-05-25 10:36:41 -07:00
committed by GitHub
parent 71c2f97056 48adf41cc1
commit 4531b38bc0
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build.sh
View File

@@ -499,7 +499,7 @@ host-jar()
BUILD_TYPE=${1:-release} BUILD_TYPE=${1:-release}
if [[ $1 = *"docs"* ]]; then if [[ $1 = *"docs"* ]]; then
# Generate documentation # Generate documentation
javadoc src/bindings/java/*.java -d docs/java javadoc src/bindings/java/com/zerotier/sockets/*.java -d docs/java
exit 0 exit 0
fi fi
VARIANT="-DZTS_ENABLE_JAVA=True" VARIANT="-DZTS_ENABLE_JAVA=True"
@@ -512,7 +512,7 @@ host-jar()
JAVA_JAR_DIR=$CACHE_DIR/pkg/jar JAVA_JAR_DIR=$CACHE_DIR/pkg/jar
JAVA_JAR_SOURCE_TREE_DIR=$JAVA_JAR_DIR/com/zerotier/sockets/ JAVA_JAR_SOURCE_TREE_DIR=$JAVA_JAR_DIR/com/zerotier/sockets/
mkdir -p $JAVA_JAR_SOURCE_TREE_DIR 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 # Build
$CMAKE $VARIANT -H. -B$CACHE_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE $VARIANT -H. -B$CACHE_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE
$CMAKE --build $CACHE_DIR $BUILD_CONCURRENCY $CMAKE --build $CACHE_DIR $BUILD_CONCURRENCY
@@ -601,7 +601,7 @@ android-aar()
export PATH=$ANDROID_HOME/cmdline-tools/tools/bin:$PATH export PATH=$ANDROID_HOME/cmdline-tools/tools/bin:$PATH
# Copy source files into project # Copy source files into project
mkdir -p ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets 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 # Build
UPPERCASE_BUILD_TYPE="$(tr '[:lower:]' '[:upper:]' <<< ${BUILD_TYPE:0:1})${BUILD_TYPE:1}" UPPERCASE_BUILD_TYPE="$(tr '[:lower:]' '[:upper:]' <<< ${BUILD_TYPE:0:1})${BUILD_TYPE:1}"
CMAKE_FLAGS="-D${CMAKE_SWITCH}=1 -D${CMAKE_SWITCH}=ON" CMAKE_FLAGS="-D${CMAKE_SWITCH}=1 -D${CMAKE_SWITCH}=ON"
@@ -652,21 +652,21 @@ format-code()
if [[ ! $(which $CLANG_FORMAT) = "" ]]; if [[ ! $(which $CLANG_FORMAT) = "" ]];
then 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 {} \; # 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 \ $CLANG_FORMAT -i --verbose include/*.h \
src/*.c \ src/*.c \
src/*.cpp \ src/*.cpp \
src/*.hpp \ src/*.hpp \
examples/c/*.c \ examples/c/*.c \
examples/csharp/*.cs \ examples/csharp/*.cs \
examples/java/*.java \ examples/java/*.java \
test/*.c \ test/*.c \
test/*.cs \ test/*.cs \
src/bindings/csharp/*.cs \ src/bindings/csharp/*.cs \
src/bindings/csharp/*.cxx \ src/bindings/csharp/*.cxx \
src/bindings/java/*.java \ src/bindings/java/com/zerotier/sockets/*.java \
src/bindings/java/*.cxx \ src/bindings/java/*.cxx \
examples/csharp/*.cs \ examples/csharp/*.cs \
src/bindings/python/PythonSockets.cxx \ src/bindings/python/PythonSockets.cxx \
src/bindings/python/PythonSocket.h src/bindings/python/PythonSocket.h
return 0 return 0
else else

0
src/bindings/java/ZeroTierDatagramSocket.java → src/bindings/java/com/zerotier/sockets/ZeroTierDatagramSocket.java
View File

0
src/bindings/java/ZeroTierEventListener.java → src/bindings/java/com/zerotier/sockets/ZeroTierEventListener.java
View File

0
src/bindings/java/ZeroTierFileDescriptorSet.java → src/bindings/java/com/zerotier/sockets/ZeroTierFileDescriptorSet.java
View File

0
src/bindings/java/ZeroTierInputStream.java → src/bindings/java/com/zerotier/sockets/ZeroTierInputStream.java
View File

0
src/bindings/java/ZeroTierNative.java → src/bindings/java/com/zerotier/sockets/ZeroTierNative.java
View File

0
src/bindings/java/ZeroTierNode.java → src/bindings/java/com/zerotier/sockets/ZeroTierNode.java
View File

0
src/bindings/java/ZeroTierOutputStream.java → src/bindings/java/com/zerotier/sockets/ZeroTierOutputStream.java
View File

0
src/bindings/java/ZeroTierPeerDetails.java → src/bindings/java/com/zerotier/sockets/ZeroTierPeerDetails.java
View File

0
src/bindings/java/ZeroTierServerSocket.java → src/bindings/java/com/zerotier/sockets/ZeroTierServerSocket.java
View File

0
src/bindings/java/ZeroTierSocket.java → src/bindings/java/com/zerotier/sockets/ZeroTierSocket.java
View File

0
src/bindings/java/ZeroTierSocketAddress.java → src/bindings/java/com/zerotier/sockets/ZeroTierSocketAddress.java
View File