Promoted dist.sh to top-level directory, updated .gitignore

.gitignore

@@ -1,3 +1,13 @@
+# Project
+# Intermediate 
+ports/android/app/src/main/java/com/zerotier/libzt/*.java
+ports/java/com/zerotier/libzt/*.java
+ports/xcode_ios-arm64/
+ports/xcode_macos/
+products/
+tmp/
+API.pdf
+
 # ZeroTier-specific 
 *.conf
 *.public

Makefile

@@ -1,10 +1,8 @@
 ifeq ($(OS),Windows_NT)
-DIST_BUILD_SCRIPT := ports\dist.bat
+DIST_BUILD_SCRIPT := dist.bat
-CLEAN_SCRIPT := ports\clean.bat
+CLEAN_SCRIPT := clean.bat
 else
-DIST_BUILD_SCRIPT := ./ports/dist.sh
+DIST_BUILD_SCRIPT := ./dist.sh
-CLEAN_SCRIPT := ./ports/clean.sh
-PACKAGE_SCRIPT := ./ports/package.sh
 endif
 
 EXECUTABLES = cmake

clean.bat

@@ -1,4 +1,6 @@
+rd /S /Q lib
 rd /S /Q bin
+rd /S /Q tmp
 rd /S /Q build
 rd /S /Q WinBuild32
 rd /S /Q WinBuild64

dist.sh

@@ -31,8 +31,7 @@
 # (4) Merge all builds into single `products` directory and package:
 #    (4a) make dist
 
-BUILD_CONCURRENCY=
+BUILD_CONCURRENCY="-j 2"
-#"-j 2"
 OSNAME=$(uname | tr '[A-Z]' '[a-z]')
 BUILD_TMP=$(pwd)/tmp
 ANDROID_PROJ_DIR=$(pwd)/ports/android
@@ -262,7 +261,7 @@ clean()
         '*.out' -o -name '*.log' -o -name '*.dSYM' -o -name '*.class' \) -delete
     # Remove any sources copied to project directories
     rm -rf ports/android/app/src/main/java/com/zerotier/libzt/*.java
-    rm -rf src/java/*.java ports/java/com/zerotier/libzt/*.java
+    rm -rf ports/java/com/zerotier/libzt/*.java
 }
 
 # Copy and rename Android AAR from lib to example app directory