Refactored Makefile, Submodule organization

Refactored Makefile to build submodules  and include
them in the final bundle.

Closes #1

Author: vchendrix

.gitignore

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

LICENSE.md

@@ -0,0 +1,11 @@
+Copyright <YEAR> <COPYRIGHT HOLDER>
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -1,26 +1,21 @@
 # A simple makefile for creating the High Resolution CFD Models bundled product
-VERSION    := `git describe --tags`
+VERSION    := $(shell git describe --tags --dirty)
 PRODUCT    := Process Models Bundle
 PROD_SNAME := ProcessModels_bundle
-LICENSE    := CCSI_TE_LICENSE_$(PROD_SNAME).txt
+LICENSE    := LICENSE.md
 PKG_DIR    := CCSI_$(PROD_SNAME)_$(VERSION)
 PACKAGE    := $(PKG_DIR).zip
 
 CATEGORIES := SolidSorbents Solvents OtherModels
 
-# 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 \
+PAYLOAD := README.md \
+	docs/*.pdf \
 	$(LICENSE)
 
 # Get just the top part (not dirname) of each entry so cp -r does the right thing
@@ -49,30 +44,28 @@ all: $(PACKAGE)
 $(CATEGORIES):
 	@mkdir -p $(PKG_DIR)/$@
 
-	@for tb in $(wildcard $@/$(TARBALLS)); do \
+	@for dir in $(wildcard $@/*); \
+	do \
+	        $(MAKE) -C $$dir clean; \
+		$(MAKE) -C $$dir; \
+	done 
+
+	@for tb in $(wildcard $@/*/$(TARBALLS)); do \
 	  tar -xzf $$tb -C $(PKG_DIR)/$@; \
 	done
 
-	@for zf in $(wildcard $@/$(ZIPFILES)); do \
+	@for zf in $(wildcard $@/*/$(ZIPFILES)); do \
 	  unzip -qo $$zf -d $(PKG_DIR)/$@; \
 	done
 
-$(PACKAGE): $(PAYLOAD) $(CATEGORIES)
+
+
+$(PACKAGE): $(CATEGORIES) $(PAYLOAD)
 	@mkdir -p $(PKG_DIR)
 	@cp -r $(PAYLOAD_TOPS) $(PKG_DIR)
 	@zip -qXr  $(PACKAGE) $(PKG_PAYLOAD)
 	@$(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)