From dc01b78e97c5c8e6d6acc1bd455f2fcd91e92ae3 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Mon, 18 Mar 2019 16:26:27 -0700
Subject: [PATCH] Promoted dist.sh to top-level directory, updated .gitignore

---
 .gitignore                   | 10 ++++++++++
 Makefile                     |  8 +++-----
 ports/clean.bat => clean.bat |  2 ++
 ports/dist.bat => dist.bat   |  0
 ports/dist.sh => dist.sh     |  5 ++---
 5 files changed, 17 insertions(+), 8 deletions(-)
 rename ports/clean.bat => clean.bat (68%)
 rename ports/dist.bat => dist.bat (100%)
 rename ports/dist.sh => dist.sh (99%)

diff --git a/.gitignore b/.gitignore
index f8797de..bfde91d 100644
--- a/.gitignore
+++ b/.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
diff --git a/Makefile b/Makefile
index 1ffb7ec..a201f6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
 ifeq ($(OS),Windows_NT)
-DIST_BUILD_SCRIPT := ports\dist.bat
-CLEAN_SCRIPT := ports\clean.bat
+DIST_BUILD_SCRIPT := dist.bat
+CLEAN_SCRIPT := clean.bat
 else
-DIST_BUILD_SCRIPT := ./ports/dist.sh
-CLEAN_SCRIPT := ./ports/clean.sh
-PACKAGE_SCRIPT := ./ports/package.sh
+DIST_BUILD_SCRIPT := ./dist.sh
 endif
 
 EXECUTABLES = cmake
diff --git a/ports/clean.bat b/clean.bat
similarity index 68%
rename from ports/clean.bat
rename to clean.bat
index 6e337a8..a8f4b09 100644
--- a/ports/clean.bat
+++ b/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
\ No newline at end of file
diff --git a/ports/dist.bat b/dist.bat
similarity index 100%
rename from ports/dist.bat
rename to dist.bat
diff --git a/ports/dist.sh b/dist.sh
similarity index 99%
rename from ports/dist.sh
rename to dist.sh
index fa6913f..0d2d77f 100755
--- a/ports/dist.sh
+++ b/dist.sh
@@ -31,8 +31,7 @@
 # (4) Merge all builds into single `products` directory and package:
 #    (4a) make dist
 
-BUILD_CONCURRENCY=
-#"-j 2"
+BUILD_CONCURRENCY="-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