Deprecated: Assigning the return value of new by reference is deprecated in /home/bluestat/public_html/source/index.php on line 477
From b2159a5e0b3ece5ad7d0379e7df15f8839691aa2 Mon Sep 17 00:00:00 2001
From: Robert Sesek
Date: Sun, 12 Aug 2012 12:58:58 -0400
Subject: [PATCH] * Stamp on each compilation of the frontend * Make stamp
work if there's no version file * Add comments for each
target
---
Makefile | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index caf3e9c..13db7de 100644
--- a/Makefile
+++ b/Makefile
@@ -21,18 +21,24 @@ FRONTEND_SOURCES=frontend/jquery-1.7.1.js \
frontend/main.js
FRONTEND_BIN=frontend/armadillo.js
-all: backend dev
+# Default target, used to produce the backend and uncompiled frontend.
+all: backend frontend
+# Creates the compiled frontend code and stamps the version information into
+# the release.
+release: backend stamp_version compiled
+
+# Compiles the backend server.
backend:
go build -v .
-frontend: $(FRONTEND_BIN)
+# Compiles the frontend code for development.
+frontend: stamp $(FRONTEND_BIN)
$(FRONTEND_BIN): $(FRONTEND_SOURCES)
echo $(foreach f,$^,"document.write('');\n") > $(FRONTEND_BIN)
-dev: version frontend
-
+# Compiles the frontend code for release.
compiled: SOURCES_FLAGS=$(foreach f,$(FRONTEND_SOURCES),--js=$f)
compiled: version
java -jar closure-compiler.jar \
@@ -40,12 +46,14 @@ compiled: version
--js_output_file=$(FRONTEND_BIN) \
--compilation_level=SIMPLE_OPTIMIZATIONS
+# Advances the frontend version.
stamp:
- gitcrement next
+ if [[ -f $(VERSION_FILE) ]]; then gitcrement next; fi;
+# Builds the version file template.
version: STAMP=$(shell date +%s)
version: BUILD=$(shell gitcrement current)
-version:
+version: stamp $(VERSION_FILE)
@echo "// This file is automatically generated." > $(VERSION_FILE)
@echo >> $(VERSION_FILE)
@echo "$$.namespace('$(VERSION_NAMESPACE)');" >> $(VERSION_FILE)
@@ -55,7 +63,8 @@ version:
echo "$(VERSION_NAMESPACE).BUILD = $(BUILD);" >> $(VERSION_FILE)
echo "$(VERSION_NAMESPACE).STAMP = $(STAMP);" >> $(VERSION_FILE)
-stamp_version: stamp version
+# Copies the version template to the source and commits it.
+stamp_version: version
cp $(VERSION_FILE) $(VERSION_SOURCE)
git commit $(VERSION_SOURCE) \
--author='Armadillo Build Script ' \
--
1.7.11.3