From b133862db6f8e6dbaa43d8e3a5c98725b6437cef Mon Sep 17 00:00:00 2001
From: Alec Grieser <agrieser@apple.com>
Date: Thu, 13 Jul 2017 10:21:36 -0700
Subject: [PATCH] added FLOW and FDB_FLOW targets to make packages of flow
 headers and libs

---
 bindings/flow/local.mk | 20 +++++++++++++++++++-
 flow/local.mk          | 24 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/bindings/flow/local.mk b/bindings/flow/local.mk
index 95814f970e..08478877d0 100644
--- a/bindings/flow/local.mk
+++ b/bindings/flow/local.mk
@@ -22,5 +22,23 @@
 
 fdb_flow_CFLAGS := -Ibindings/c $(fdbrpc_CFLAGS)
 fdb_flow_LDFLAGS := -Llib -lfdb_c $(fdbrpc_LDFLAGS)
-fdb_flow_LIBS := lib/libfdbrpc.a
+fdb_flow_LIBS :=
 
+packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: fdb_flow
+	@echo "Packaging      fdb_flow"
+	@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@mkdir -p packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb
+	@cp lib/libfdb_flow.a packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
+	@find bindings/flow -name '*.h' -not -name '*tester*' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow \;
+	@find bindings/c/foundationdb -name '*.h' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb \;
+	@tar czf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+
+FDB_FLOW: packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
+
+FDB_FLOW_clean:
+	@echo "Cleaning       fdb_flow package"
+	@rm -rf packages/fdb-flow-*.tar.gz
+
+packages: FDB_FLOW
+packages_clean: FDB_FLOW_clean
diff --git a/flow/local.mk b/flow/local.mk
index defc7af0b0..8701ff9e45 100644
--- a/flow/local.mk
+++ b/flow/local.mk
@@ -37,3 +37,27 @@ flow/hgVersion.h: FORCE
 
 lib/libflow.a: bin/coverage.flow.xml
 
+ifeq ($(RELEASE),true)
+  FLOWVER = $(VERSION)
+else
+  FLOWVER = $(VERSION)-PRERELEASE
+endif
+
+packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: flow
+	@echo "Packaging      flow"
+	@rm -rf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@mkdir -p packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/bin packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/flow
+	@cp lib/libflow.a packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
+	@cp bin/actorcompiler.exe packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/bin
+	@find flow -name '*.h' -exec cp {} packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/flow \;
+	@tar czf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@rm -rf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+
+FLOW: packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
+
+FLOW_clean:
+	@echo "Cleaning       flow"
+	@rm -rf packages/flow-*.tar.gz
+
+packages: FLOW
+packages_clean: FLOW_clean