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

Build script improvements for linux

Browse Source
This commit is contained in:
Joseph Henry
2019-03-12 16:28:25 -07:00
parent 795a9f082b
commit d26f851c01
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -20,6 +20,8 @@ patch:
.PHONY: clean .PHONY: clean
clean: clean:
-rm -rf ports/android/app/build -rm -rf ports/android/app/build
-rm -rf ports/xcode_macos
-rm -rf ports/xcode_ios-arm64
-rm -rf tmp lib bin products -rm -rf tmp lib bin products
-find ports -name ".externalNativeBuild" -exec rm -r "{}" \; -find ports -name ".externalNativeBuild" -exec rm -r "{}" \;
-rm -f *.o *.s *.exp *.lib *.core core -rm -f *.o *.s *.exp *.lib *.core core

16
ports/dist.sh
View File

@@ -205,9 +205,11 @@ cleanup()
find $(pwd)/lib -type f -name 'libnatpmp_pic.a' -exec rm {} + find $(pwd)/lib -type f -name 'libnatpmp_pic.a' -exec rm {} +
find $(pwd)/lib -type f -name 'libzto_pic.a' -exec rm {} + find $(pwd)/lib -type f -name 'libzto_pic.a' -exec rm {} +
find $(pwd)/lib -type f -name 'libzt_pic.a' -exec rm {} + find $(pwd)/lib -type f -name 'libzt_pic.a' -exec rm {} +
find $(pwd)/lib -type f -name 'libzerotiercore.a' -exec rm {} + #find $(pwd)/lib -type f -name 'libztcore.a' -exec rm {} +
} }
# Copies binaries, documentation, licenses, etc into a products
# dir and then tarballs everything together
package_everything() package_everything()
{ {
echo "Executing task: " ${FUNCNAME[ 0 ]} "(" $1 ")" echo "Executing task: " ${FUNCNAME[ 0 ]} "(" $1 ")"
@@ -224,13 +226,14 @@ package_everything()
cp $(pwd)/LICENSE.GPL-3 $LICENSE_DIR/ZEROTIER-LICENSE.GPL-3 cp $(pwd)/LICENSE.GPL-3 $LICENSE_DIR/ZEROTIER-LICENSE.GPL-3
cp $(pwd)/include/net/ROUTE_H-LICENSE.APSL $LICENSE_DIR/ROUTE_H-LICENSE.APSL cp $(pwd)/include/net/ROUTE_H-LICENSE.APSL $LICENSE_DIR/ROUTE_H-LICENSE.APSL
cp $(pwd)/include/net/ROUTE_H-LICENSE $LICENSE_DIR/ROUTE_H-LICENSE cp $(pwd)/include/net/ROUTE_H-LICENSE $LICENSE_DIR/ROUTE_H-LICENSE
# Documentation # Documentation
#mkdir -p $PROD_DIR/doc #mkdir -p $PROD_DIR/doc
#cp $(pwd)/README.md $PROD_DIR/doc #cp $(pwd)/README.md $PROD_DIR/doc
cp $(pwd)/API.md $PROD_DIR/
# Header(s) # Header(s)
mkdir -p $PROD_DIR/include mkdir -p $PROD_DIR/include
cp $(pwd)/include/*.h $PROD_DIR/include cp $(pwd)/include/*.h $PROD_DIR/include
cp $(pwd)/ext/ZeroTierOne/include/ZeroTierOne.h $PROD_DIR/include
# Libraries # Libraries
mkdir -p $PROD_DIR/lib mkdir -p $PROD_DIR/lib
cp -r $(pwd)/lib/$1/* $PROD_DIR/lib cp -r $(pwd)/lib/$1/* $PROD_DIR/lib
@@ -247,8 +250,13 @@ package_everything()
#question in our Community section' > $PROD_DIR/README.FIRST #question in our Community section' > $PROD_DIR/README.FIRST
# Tar everything # Tar everything
PROD_FILENAME=$(pwd)/products/$PROD_NAME.tar.gz PROD_FILENAME=$(pwd)/products/$PROD_NAME.tar.gz
tar --exclude=$PROD_FILENAME -zcvf $PROD_FILENAME $PROD_DIR tar --exclude=$PROD_FILENAME -zcvf $PROD_FILENAME -C $PROD_DIR .
md5 $PROD_FILENAME if [[ $OSNAME = *"darwin"* ]]; then
md5 $PROD_FILENAME
fi
if [[ $OSNAME = *"linux"* ]]; then
md5sum $PROD_FILENAME
fi
} }
dist() dist()