diff --git a/packages/clean.sh b/packages/clean.sh index 33bceb9..65e8421 100755 --- a/packages/clean.sh +++ b/packages/clean.sh @@ -3,5 +3,5 @@ rm -rf bin build products tmp rm -f *.o *.s *.exp *.lib .depend* *.core core rm -rf .depend -find . -type f \( -name '*.o' -o -name '*.so' -o -name \ - '*.o.d' -o -name '*.out' -o -name '*.log' -o -name '*.dSYM' -o -name '*.class' \) -delete +find . -type f \( -name '*.o' -o -name '*.o.d' -o -name \ + '*.out' -o -name '*.log' -o -name '*.dSYM' -o -name '*.class' \) -delete diff --git a/packages/dist.sh b/packages/dist.sh index 4e2fde8..ec515fa 100755 --- a/packages/dist.sh +++ b/packages/dist.sh @@ -75,7 +75,7 @@ generate_projects_if_necessary() build_all_products() { CONFIG=$1 - UPPERCASE_CONFIG="$(tr '[:lower:]' '[:upper:]' <<< $1:0:1)$1:1" + UPPERCASE_CONFIG="$(tr '[:lower:]' '[:upper:]' <<< ${1:0:1})${1:1}" # Targets to build on and for darwin if [[ $OSNAME = *"darwin"* ]]; then @@ -143,10 +143,11 @@ build_all_products() if [[ $OSNAME = *"linux"* ]]; then CURR_BUILD_PRODUCTS_DIR=$LIB_PRODUCTS_DIR/ # Ordinary libraries - if false; then + if true; then rm -rf $LIB_PRODUCTS_DIR cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DBUILD_TESTS=0" - cmake --build build -j $BUILD_CONCURRENCY + cmake --build build + # -j $BUILD_CONCURRENCY CURR_ARCH=$HOSTTYPE CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$CURR_ARCH mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR @@ -155,7 +156,8 @@ build_all_products() if true; then rm -rf $LIB_PRODUCTS_DIR cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DJNI=1 -DBUILD_TESTS=0" - cmake --build build -j $BUILD_CONCURRENCY + cmake --build build + # -j $BUILD_CONCURRENCY CURR_ARCH=$HOSTTYPE CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$CURR_ARCH mkdir -p $CURR_TMP_PRODUCT_DIR diff --git a/packages/package.sh b/packages/package.sh index f172623..4e5cf7f 100755 --- a/packages/package.sh +++ b/packages/package.sh @@ -5,7 +5,7 @@ LIBNAME="lib"$PROJNAME LIBZT_VERSION="1.2.0" LIBZT_REVISION="1" ZT_CORE_VERSION="1.2.12" -FILENAME_PREFIX=${LIBNAME}"-"${LIBZT_VERSION}"r"${LIBZT_REVISION} +FILENAME_PREFIX=${LIBNAME} STAGING_DIR=$(pwd)/staging STAGING_DEBUG_DIR=$(pwd)/staging/debug @@ -16,22 +16,28 @@ FINISHED_PRODUCTS_DIR=$(pwd)/products find . -type f \( -name '*.DS_Store' -o -name 'thumbs.db' \) -delete # Emit a README file -echo $'ZeroTier 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 \nlibzt Repo: https://github.com/zerotier/libzt' > ${STAGING_DIR}/README.md +cp ${STAGING_DIR}/README.md ${STAGING_DIR}/debug/README.md +cp ${STAGING_DIR}/README.md ${STAGING_DIR}/release/README.md + # Package everything together # (debug) PRODUCT_FILENAME=${FILENAME_PREFIX}-debug.tar.gz echo "Making: " ${FINISHED_PRODUCTS_DIR}/${PRODUCT_FILENAME} cd ${STAGING_DEBUG_DIR} tar --exclude=${PRODUCT_FILENAME} -zcvf ${PRODUCT_FILENAME} . +md5 $PRODUCT_FILENAME mv *.tar.gz ${FINISHED_PRODUCTS_DIR} cd - + # (release) PRODUCT_FILENAME=${FILENAME_PREFIX}-release.tar.gz echo "Making: " ${FINISHED_PRODUCTS_DIR}/${PRODUCT_FILENAME} cd ${STAGING_RELEASE_DIR} tar --exclude=${PRODUCT_FILENAME} -zcvf ${PRODUCT_FILENAME} . +md5 $PRODUCT_FILENAME mv *.tar.gz ${FINISHED_PRODUCTS_DIR} cd - \ No newline at end of file