From 0c350e3428b9c4376fd18d0623b9058a5c30a21f Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 19 Dec 2010 22:23:14 -0800
Subject: [PATCH] update Makefile and combiner w/ new assets for Github Finder

---
 Makefile                       | 12 ++++++++----
 combine.sh                     |  4 ++--
 templates/proj/proj/index.html |  4 +---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c54beee..d5e41ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
 JAVASCRIPTS=assets/blog.js assets/gitter.js assets/jquery-serializeObject.js assets/proj.js \
 	    assets/request.js assets/showdown.js assets/storage-polyfill.js assets/store.js \
-	    assets/strftime.js assets/tmpl.js
+	    assets/strftime.js assets/tmpl.js assets/ghfinder.js assets/code_highlighter.js
 
 MIN_JAVASCRIPTS=assets/blog.min.js assets/gitter.min.js assets/jquery-serializeObject.min.js assets/proj.min.js \
 		assets/request.min.js assets/showdown.min.js assets/storage-polyfill.min.js assets/store.min.js \
-		assets/strftime.min.js assets/tmpl.min.js
+		assets/strftime.min.js assets/tmpl.min.js assets/ghfinder.min.js assets/code_highlighter.min.js
+
+STYLESHEETS=assets/style.css assets/blog.css assets/proj.css
+
+MIN_STYLESHEETS=assets/style.min.css assets/blog.min.css assets/proj.min.css
 
 POSTS=$(shell echo _blog/published/*.html)
 
@@ -17,11 +21,11 @@ blog: _blog/blog.json templates/blog/index.html templates/blog/post.html $(POSTS
 	@echo
 	./blog.rb _blog blog
 
-minify: $(JAVASCRIPTS)
+minify: $(JAVASCRIPTS) $(STYLESHEETS)
 	@echo
 	./minify.sh
 
-combine: minify $(MIN_JAVASCRIPTS)
+combine: minify $(MIN_JAVASCRIPTS) $(MIN_STYLESHEETS)
 	@echo
 	./combine.sh
 
diff --git a/combine.sh b/combine.sh
index 4b40fd6..ad0ef22 100755
--- a/combine.sh
+++ b/combine.sh
@@ -3,8 +3,8 @@
 echo "request,showdown,strftime,tmpl,jquery-serializeObject,blog -> assets/blog-all.min.js"
 cat assets/{request,showdown,strftime,tmpl,jquery-serializeObject,blog}.min.js >|assets/blog-all.min.js
 
-echo "gitter.store,proj -> assets/proj-all.min.js"
-cat assets/{gitter,store,proj}.min.js >|assets/proj-all.min.js
+echo "gitter.store,proj,ghfinder,code_highlighter -> assets/proj-all.min.js"
+cat assets/{gitter,store,proj,ghfinder,code_highlighter}.min.js >|assets/proj-all.min.js
 
 echo "style,proj -> assets/proj-all.min.css"
 cat assets/{style,proj}.min.css >|assets/proj-all.min.css
diff --git a/templates/proj/proj/index.html b/templates/proj/proj/index.html
index 797fa63..54967a5 100644
--- a/templates/proj/proj/index.html
+++ b/templates/proj/proj/index.html
@@ -21,10 +21,8 @@
   <script src=http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js></script>
   <script src=../../assets/storage-polyfill.min.js></script>
   <![endif]-->
-  <script src=../../assets/proj-all.min.js></script>
   <script src=http://ajax.googleapis.com/ajax/libs/prototype/1.6.1.0/prototype.js></script>
-  <script src=../../assets/ghfinder.js></script>
-  <script src=../../assets/code_highlighter.js></script>
+  <script src=../../assets/proj-all.min.js></script>
   <script>
     (function() {
       SJS.proj('{{name}}')