From 626314a82f74738a9888fc5ffe511bb47dd4d8ec Mon Sep 17 00:00:00 2001
From: Fred Cooke <fred.cooke@gmail.com>
Date: Mon, 24 May 2010 15:16:43 +1200
Subject: [PATCH] Update makefile with changes to do automatic releases, update
 versions and names etc

---
 docs/Doxyfile         |  2 +-
 src/Makefile          | 15 +++++++++++++--
 src/Makefile.windows  | 11 +++++++++--
 src/doxy/changeLogs.h |  4 ++--
 src/globalConstants.c |  2 +-
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/docs/Doxyfile b/docs/Doxyfile
index a717b8a..9d294f1 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = FreeEMS
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "0.1.0-SNAPSHOT"
+PROJECT_NUMBER         = "0.1.0 UltraJizz"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/src/Makefile b/src/Makefile
index a3ed722..c7fb457 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -69,7 +69,7 @@
 
 
 # Constants
-VERSION = 0.1.0-SNAPSHOT
+VERSION = 0.1.0
 OUTPREFIX = freeems
 
 # Directories here
@@ -652,8 +652,19 @@ $(OBJECTS) $(OBJECTSRPM): $(OBJDIR)/%.o: $(ASMDIR)/%.s
 ################################################################################
 
 
+	
 testgit:
-	#check git status for changes, fail build if not fully commited
+	@echo "################################################################################"
+	@echo "#                            Checking git status...                            #"
+	@echo "################################################################################"
+	@echo "Fetching from origin..."
+	git fetch
+	@echo "Is everything checked in?"
+	test `git status -s | wc -l` -eq 0
+	@echo "Are we behind?"
+	test `git rev-list \`git show-ref --hash refs/heads/master\`..\`git show-ref --hash refs/remotes/origin/master\` | wc -l` -eq 0
+	@echo "Are we ahead?"
+	test `git rev-list \`git show-ref --hash refs/remotes/origin/master\`..\`git show-ref --hash refs/heads/master\` | wc -l` -eq 0
 
 
 ALLMD5S = $(patsubst $(S19DIR)/%,$(RELEASEDIR)/%.md5,$(ALLS19S))
diff --git a/src/Makefile.windows b/src/Makefile.windows
index 8bb4ad0..243e496 100644
--- a/src/Makefile.windows
+++ b/src/Makefile.windows
@@ -63,7 +63,7 @@
 
 
 # Constants
-VERSION = 0.1.0-SNAPSHOT
+VERSION = 0.1.0
 OUTPREFIX = freeems
 
 # Directories here
@@ -540,8 +540,15 @@ $(OBJECTS) $(OBJECTSRPM): $(OBJDIR)/%.o: $(ASMDIR)/%.s
 #                     Release Procedure Target Definitions                     #
 
 
+	
 testgit:
-	#check git status for changes, fail build if not fully commited
+	git fetch
+	@echo "Is everything checked in?"
+	test `git status -s | wc -l` -eq 0
+	@echo "Are we behind?"
+	test `git rev-list \`git show-ref --hash refs/heads/master\`..\`git show-ref --hash refs/remotes/origin/master\` | wc -l` -eq 0
+	@echo "Are we ahead?"
+	test `git rev-list \`git show-ref --hash refs/remotes/origin/master\`..\`git show-ref --hash refs/heads/master\` | wc -l` -eq 0
 
 
 ALLMD5S = $(patsubst $(S19DIR)/%,$(RELEASEDIR)/%.md5,$(ALLS19S))
diff --git a/src/doxy/changeLogs.h b/src/doxy/changeLogs.h
index 6f5bc8d..61a06dc 100644
--- a/src/doxy/changeLogs.h
+++ b/src/doxy/changeLogs.h
@@ -6,9 +6,9 @@
  *
  * Please place your entries at the bottom of the list in the same format as the rest.
  *
- * @version 0.1.0 ??????
+ * @version 0.1.0 UltraJizz
  *
- * @date 23/05/10 ??? 23:58 GMT
+ * @date 24/05/10 06:45 GMT
  *
  * @b Changes:
  * - Added awk script to auto generate JSON lists from C source files
diff --git a/src/globalConstants.c b/src/globalConstants.c
index d14d30f..4e92c5b 100644
--- a/src/globalConstants.c
+++ b/src/globalConstants.c
@@ -74,7 +74,7 @@ const unsigned char interfaceVersionAndType[20] = {0,0,0,'I','F','r','e','e','E'
  *
  * This should change every time the code is changed at all (even a little) before each release.
  */
-const unsigned char firmwareVersion[40] = {"FreeEMS Vanilla 0.1.0 pre-release alpha"};
+const unsigned char firmwareVersion[32] = {"FreeEMS Vanilla 0.1.0 UltraJizz"};
 
 /** Divisors and untunable physical constants combined into a single master fuel constant
  *
-- 
2.11.4.GIT