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

Improvements to distribution and packaging scripts

Browse Source
This commit is contained in:
Joseph Henry
2018-09-04 10:48:36 -07:00
parent ecb214fa67
commit ab8da325d0
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/dist.sh
View File

@@ -91,7 +91,7 @@ build_all_products()
xcodebuild -target zt -configuration "$UPPERCASE_CONFIG" -sdk "iphoneos" xcodebuild -target zt -configuration "$UPPERCASE_CONFIG" -sdk "iphoneos"
xcodebuild -target zt-static -configuration "$UPPERCASE_CONFIG" -sdk "iphoneos" xcodebuild -target zt-static -configuration "$UPPERCASE_CONFIG" -sdk "iphoneos"
cd - cd -
CURR_ARCH="arm64" # anything older should be built custom CURR_ARCH="arm64" # spoof this architecture since HOSTTYPE is likely x86_64
CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/ios-$CURR_ARCH CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/ios-$CURR_ARCH
mkdir -p $CURR_TMP_PRODUCT_DIR mkdir -p $CURR_TMP_PRODUCT_DIR
mv $CURR_BUILD_PRODUCTS_DIR/*.framework $CURR_TMP_PRODUCT_DIR mv $CURR_BUILD_PRODUCTS_DIR/*.framework $CURR_TMP_PRODUCT_DIR
@@ -104,8 +104,7 @@ build_all_products()
xcodebuild -target zt-static -configuration "$UPPERCASE_CONFIG" -sdk "macosx" xcodebuild -target zt-static -configuration "$UPPERCASE_CONFIG" -sdk "macosx"
xcodebuild -target zt-shared -configuration "$UPPERCASE_CONFIG" -sdk "macosx" xcodebuild -target zt-shared -configuration "$UPPERCASE_CONFIG" -sdk "macosx"
cd - cd -
CURR_ARCH=$HOSTTYPE CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$(uname -m)
CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$CURR_ARCH
mkdir -p $CURR_TMP_PRODUCT_DIR mkdir -p $CURR_TMP_PRODUCT_DIR
mv $CURR_BUILD_PRODUCTS_DIR/*.framework $CURR_TMP_PRODUCT_DIR mv $CURR_BUILD_PRODUCTS_DIR/*.framework $CURR_TMP_PRODUCT_DIR
mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR
@@ -114,7 +113,7 @@ build_all_products()
# Android Archive (AAR) --- Executes a Gradle task # Android Archive (AAR) --- Executes a Gradle task
if true; then if true; then
CMAKE_FLAGS=$CMAKE_FLAGS" -DJNI=1" CMAKE_FLAGS=$CMAKE_FLAGS" -DJNI=1"
CURR_ARCH="armeabi-v7a" CURR_ARCH="armeabi-v7a" # spoof this architecture since HOSTTYPE is likely x86_64
CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/android-$CURR_ARCH CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/android-$CURR_ARCH
mkdir -p $CURR_TMP_PRODUCT_DIR mkdir -p $CURR_TMP_PRODUCT_DIR
echo "BUILDING: AAR" echo "BUILDING: AAR"
@@ -126,8 +125,7 @@ build_all_products()
# Java Archive (JAR) # Java Archive (JAR)
if true; then if true; then
CMAKE_FLAGS=$CMAKE_FLAGS" -DJNI=1" CMAKE_FLAGS=$CMAKE_FLAGS" -DJNI=1"
CURR_ARCH=$HOSTTYPE CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$(uname -m)
CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$CURR_ARCH
mkdir -p $CURR_TMP_PRODUCT_DIR mkdir -p $CURR_TMP_PRODUCT_DIR
echo "BUILDING: JAR" echo "BUILDING: JAR"
rm -rf $LIB_PRODUCTS_DIR # clean-lite rm -rf $LIB_PRODUCTS_DIR # clean-lite
@@ -150,8 +148,7 @@ build_all_products()
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DBUILD_TESTS=0" cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DBUILD_TESTS=0"
cmake --build build cmake --build build
# -j $BUILD_CONCURRENCY # -j $BUILD_CONCURRENCY
CURR_ARCH=$HOSTTYPE CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$(uname -m)
CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$CURR_ARCH
mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR
fi fi
# Java JAR file # Java JAR file
@@ -160,8 +157,7 @@ build_all_products()
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DJNI=1 -DBUILD_TESTS=0" cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DJNI=1 -DBUILD_TESTS=0"
cmake --build build cmake --build build
# -j $BUILD_CONCURRENCY # -j $BUILD_CONCURRENCY
CURR_ARCH=$HOSTTYPE CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$(uname -m)
CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$CURR_ARCH
mkdir -p $CURR_TMP_PRODUCT_DIR mkdir -p $CURR_TMP_PRODUCT_DIR
cd $PROJROOT/packages/java cd $PROJROOT/packages/java
#cp $CURR_BUILD_PRODUCTS_DIR/libzt.so . #cp $CURR_BUILD_PRODUCTS_DIR/libzt.so .

2
packages/package.sh
View File

@@ -16,7 +16,7 @@ FINISHED_PRODUCTS_DIR=$(pwd)/products
find . -type f \( -name '*.DS_Store' -o -name 'thumbs.db' \) -delete find . -type f \( -name '*.DS_Store' -o -name 'thumbs.db' \) -delete
# Emit a README file # Emit a README file
echo $'* libzt version: '${LIBZT_VERSION}$'r'${LIBZT_REVISION}$'\n* Core ZeroTier version: '${ZT_CORE_VERSION}$'\n* date: '$(date)$'\n\nZeroTier Manual: https://www.zerotier.com/manual.shtml\n echo $'* libzt version: '${LIBZT_VERSION}$'r'${LIBZT_REVISION}$'\n* Core ZeroTier version: '${ZT_CORE_VERSION}$'\n* Date: '$(date)$'\n\nZeroTier Manual: https://www.zerotier.com/manual.shtml\n
Other Downloads: https://www.zerotier.com/download.shtml Other Downloads: https://www.zerotier.com/download.shtml
\nlibzt Repo: https://github.com/zerotier/libzt' > ${STAGING_DIR}/README.md \nlibzt Repo: https://github.com/zerotier/libzt' > ${STAGING_DIR}/README.md