Update Makefile to pull version from git

Author: vchendrix

.gitignore

@@ -0,0 +1 @@
+*.zip

Makefile

@@ -1,26 +1,21 @@
 # A simple makefile for creating the High Resolution CFD Models bundled product
-VERSION    := 2016.02.00
+VERSION    := $(shell git describe --tags --dirty)
 PRODUCT    := CFD Models Bundle
 PROD_SNAME := CFDModels_bundle
-LICENSE    := CCSI_TE_LICENSE_$(PROD_SNAME).txt
+LICENSE    := LICENSE.md
 PKG_DIR    := CCSI_$(PROD_SNAME)_$(VERSION)
 PACKAGE    := $(PKG_DIR).zip
 
 CATEGORIES := Sorbents Solvents
 
-# Where Jenkins should checkout ^/projects/common/trunk/
-COMMON := .ccsi_common
-LEGAL_DOCS := LEGAL \
-           CCSI_TE_LICENSE.txt
-
 TARBALLS := *.tgz
 ZIPFILES := *.zip
 
 # The bundled packages, as found in each category subdir
 SUB_PACKAGES := $(foreach c,$(CATEGORIES), $(wildcard $c/$(TARBALLS) $c/$(ZIPFILES)))
 
 PAYLOAD := docs/*.pdf \
-	LEGAL \
+	README.md \
 	$(LICENSE)
 
 # Get just the top part (not dirname) of each entry so cp -r does the right thing
@@ -47,35 +42,32 @@ all: $(PACKAGE)
 # Go into each category's subdir and break open the archives there
 # into the corresponding subdir in the PKG_DIR
 $(CATEGORIES):
+	@echo "Packaging $@"
 	@mkdir -p $(PKG_DIR)/$@
+	@$(MAKE) -C $@ clean
+	@$(MAKE) -C $@
 
-	@for tb in $(wildcard $@/$(TARBALLS)); do \
-	  tar -xzf $$tb -C $(PKG_DIR)/$@; \
-	done
 
-	@for zf in $(wildcard $@/$(ZIPFILES)); do \
-	  unzip -qo $$zf -d $(PKG_DIR)/$@; \
-	done
 
-
-$(PACKAGE): $(PAYLOAD) $(CATEGORIES)
+$(PACKAGE): $(CATEGORIES) $(PAYLOAD) 
+	@echo "Packaging $(PKG_DIR)"
 	@mkdir -p $(PKG_DIR)
+	@for cat in $(CATEGORIES); do \
+	for tb in $$cat/**{,/*}/$(TARBALLS); do \
+	  if [ -f $$tb ]; then\
+	    tar -xf $$tb -C $(PKG_DIR)/$$cat/; \
+	  fi; \
+	done; \
+	for zf in $$cat/*/$(ZIPFILES); do \
+	  if [ -f $$zf ]; then\
+	    unzip -qo $$zf -d $(PKG_DIR)/$$cat; \
+	  fi; \
+	done; \
+	done
 	@cp -r $(PAYLOAD_TOPS) $(PKG_DIR)
-	@zip -qXr $(PACKAGE) $(PKG_PAYLOAD)
+	@zip -qXr $(PACKAGE) $(PKG_DIR)
 	@$(MD5BIN) $(PACKAGE)
-	@rm -rf $(PKG_DIR) $(LEGAL_DOCS) $(LICENSE)
-
-
-$(LICENSE): CCSI_TE_LICENSE.txt 
-	@sed "s/\[SOFTWARE NAME \& VERSION\]/$(PRODUCT) v.$(VERSION)/" < CCSI_TE_LICENSE.txt > $(LICENSE)
-
-$(LEGAL_DOCS):
-	@if [ -d $(COMMON) ]; then \
-	  cp $(COMMON)/$@ .; \
-	else \
-	  svn -q export ^/projects/common/trunk/$@; \
-	fi
-
+	@rm -rf $(PKG_DIR)
 
 clean:
-	@rm -rf $(PACKAGE) $(PKG_DIR) $(LEGAL_DOCS) $(LICENSE)
+	@rm -rf $(PACKAGE) $(PKG_DIR)

Solvents/Makefile

@@ -0,0 +1,9 @@
+TOPTARGETS := all clean
+
+SUBDIRS := $(wildcard */.)
+
+$(TOPTARGETS): $(SUBDIRS)
+$(SUBDIRS): 
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(SUBDIRS)

Solvents/WWC

@@ -0,0 +1,9 @@
+TOPTARGETS := all clean
+
+SUBDIRS := $(wildcard */.)
+
+$(TOPTARGETS): $(SUBDIRS)
+$(SUBDIRS): 
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(SUBDIRS)