Merge pull request #214 from zerotier/brenton/move
Move java files to com/zerotier/sockets subfolder
This commit is contained in:
8
build.sh
8
build.sh
@@ -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"
|
||||||
@@ -663,7 +663,7 @@ format-code()
|
|||||||
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 \
|
||||||
|
|||||||
Reference in New Issue
Block a user