From 016e8a59a0d97c0d044f7f8c7cd79d14f79b73ce Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Sun, 10 Mar 2013 15:17:16 -0400 Subject: [PATCH] Adding in better makefiles. --- site/Makefile | 11 +++++++---- site/coffee/Makefile | 18 ++++++++++++++++++ site/coffee/main.coffee | 22 +++++++++++++++++----- site/less/Makefile | 21 +++++++++++++++++++++ site/less/hy.less | 2 +- site/templates/base.html | 3 +++ site/templates/index.html | 17 +++++++++++++++-- 7 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 site/coffee/Makefile create mode 100644 site/less/Makefile diff --git a/site/Makefile b/site/Makefile index 6c187e9..80f99df 100644 --- a/site/Makefile +++ b/site/Makefile @@ -1,9 +1,8 @@ -# - LESSC = lessc LESSCFLAGS = -x STATIC = static STATIC_CSS = $(STATIC)/css +STATIC_JS = $(STATIC)/js all: build @@ -12,11 +11,15 @@ all: build build: clean less coffee + less: - $(LESSC) $(LESSCFLAGS) less/hy.less > $(STATIC_CSS)/hy.css + make -C less + mv less/*css $(STATIC_CSS) + coffee: - coffee -o static/js -c ./coffee/* + make -C coffee + mv coffee/*js $(STATIC_JS) clean: rm -f $(STATIC_CSS)/hy.css diff --git a/site/coffee/Makefile b/site/coffee/Makefile new file mode 100644 index 0000000..a276b08 --- /dev/null +++ b/site/coffee/Makefile @@ -0,0 +1,18 @@ +.SUFFIXES: +.SUFFIXES: .coffee .js + +COFFEE_SCRIPTS = main.js + + +all: build + + +build: $(COFFEE_SCRIPTS) + + +.coffee.js: + coffee -c $< + uglifyjs --no-copyright --overwrite $@ + + +.PHONY: build diff --git a/site/coffee/main.coffee b/site/coffee/main.coffee index f90ef97..e0c80fe 100644 --- a/site/coffee/main.coffee +++ b/site/coffee/main.coffee @@ -1,6 +1,18 @@ -foo = (x) -> - if x < 2 - return x - foo(x - 1) + foo(x - 2) +reload = -> + input = $("#repl-input").val() + $('#repl-output').load('/hy2pycol', {'code': input}) -alert(foo(10)) +$(document).ready(-> + count = 0 + $("#repl-input").keyup((e) -> + curcount = 0 + count += 1 + curcount = count + window.setTimeout(-> + if curcount == count + console.log("trigger") + reload() + , 500) + ) + reload() +); diff --git a/site/less/Makefile b/site/less/Makefile new file mode 100644 index 0000000..a720a4c --- /dev/null +++ b/site/less/Makefile @@ -0,0 +1,21 @@ +LESS_SCRIPTS = hy.css + +LESSC = lessc +LESSCFLAGS = -x +STATIC = static + +.SUFFIXES: +.SUFFIXES: .less .css + + +all: build + + +build: $(LESS_SCRIPTS) + + +.less.css: + $(LESSC) $(LESSCFLAGS) $< > $@ + + +.PHONY: build diff --git a/site/less/hy.less b/site/less/hy.less index 97ebbd9..5d3c941 100644 --- a/site/less/hy.less +++ b/site/less/hy.less @@ -2,5 +2,5 @@ * terms and conditions of Hy it's self. */ body { - + color: #DFCDCDC; } diff --git a/site/templates/base.html b/site/templates/base.html index 65d251d..f74870a 100644 --- a/site/templates/base.html +++ b/site/templates/base.html @@ -8,8 +8,11 @@ + + {% block content %} diff --git a/site/templates/index.html b/site/templates/index.html index 7ba9d95..d4be101 100644 --- a/site/templates/index.html +++ b/site/templates/index.html @@ -4,8 +4,21 @@ {% block content %} -{% autoescape off %}{% code "clojure" %} +{# {% autoescape off %}{% code "clojure" %} (print "foo bar") -{% endcode %}{% endautoescape %} +{% endcode %}{% endautoescape %} #} + +
+ + 

+                

 
 {% endblock %}