sjs/samhuri.net
1
0
Fork 0
mirror of https://github.com/samsonjs/samhuri.net.git synced 2026-04-27 14:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update Makefile and combiner w/ new assets for Github Finder

Browse source
This commit is contained in:
Sami Samhuri 2010-12-19 22:23:14 -08:00
parent e44f3c6e6a
commit 0c350e3428
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -1,10 +1,14 @@
JAVASCRIPTS=assets/blog.js assets/gitter.js assets/jquery-serializeObject.js assets/proj.js \ 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/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 \ 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/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) POSTS=$(shell echo _blog/published/*.html)
@ -17,11 +21,11 @@ blog: _blog/blog.json templates/blog/index.html templates/blog/post.html $(POSTS
@echo @echo
./blog.rb _blog blog ./blog.rb _blog blog
minify: $(JAVASCRIPTS) minify: $(JAVASCRIPTS) $(STYLESHEETS)
@echo @echo
./minify.sh ./minify.sh
combine: minify $(MIN_JAVASCRIPTS) combine: minify $(MIN_JAVASCRIPTS) $(MIN_STYLESHEETS)
@echo @echo
./combine.sh ./combine.sh

4
combine.sh
View file

@ -3,8 +3,8 @@
echo "request,showdown,strftime,tmpl,jquery-serializeObject,blog -> assets/blog-all.min.js" 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 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" echo "gitter.store,proj,ghfinder,code_highlighter -> assets/proj-all.min.js"
cat assets/{gitter,store,proj}.min.js >|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" echo "style,proj -> assets/proj-all.min.css"
cat assets/{style,proj}.min.css >|assets/proj-all.min.css cat assets/{style,proj}.min.css >|assets/proj-all.min.css

4
templates/proj/proj/index.html
View file

@ -21,10 +21,8 @@
<script src=http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js></script> <script src=http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js></script>
<script src=../../assets/storage-polyfill.min.js></script> <script src=../../assets/storage-polyfill.min.js></script>
<![endif]--> <![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=http://ajax.googleapis.com/ajax/libs/prototype/1.6.1.0/prototype.js></script>
<script src=../../assets/ghfinder.js></script> <script src=../../assets/proj-all.min.js></script>
<script src=../../assets/code_highlighter.js></script>
<script> <script>
(function() { (function() {
SJS.proj('{{name}}') SJS.proj('{{name}}')