From f91254e50d16e107418a35e9081701a68e131dcc Mon Sep 17 00:00:00 2001 From: Pavel Lang Date: Fri, 10 Aug 2012 00:41:56 +0200 Subject: [PATCH] makefile --- .gitignore | 1 + Makefile | 2 +- debug | 3 ++- development | 2 ++ package.json | 4 ++-- pages/markdown.md | 4 ++++ production | 2 ++ 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48c9d30..86b54d4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ conf.json /public/javascripts/*.min.js public/javascripts/highlight.js public/javascripts/site.js +public/stylesheets/style.css diff --git a/Makefile b/Makefile index 8a4f898..cbf1b73 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ UGLIFY=./node_modules/.bin/uglifyjs BROWSERIFIABLE=$(shell ls browserify/*.js | sed s+browserify/+public/javascripts/+) UGLIFIABLE=$(shell ls public/javascripts/*.js | grep -ve '\.min\.js$$' | sed s+.js$$+.min.js+) -all: browserify public/javascripts/site.js +all: module-bootstrap browserify public/javascripts/site.js make uglify clean: clean-styles clean-uglified clean-browsefied diff --git a/debug b/debug index 7b8037d..a6e5f15 100755 --- a/debug +++ b/debug @@ -2,6 +2,7 @@ lsof | grep *:http-alt || node-inspector & -sleep 1s && gnome-open http://0.0.0.0:8080/debug?port=5858 & +make && sleep 1s && gnome-open http://0.0.0.0:8080/debug?port=5858 & TZ=/usr/share/zoneinfo/UTC NODE_ENV=development DEBUG=* node --debug-brk server.js + diff --git a/development b/development index 252c0db..b46e45c 100755 --- a/development +++ b/development @@ -1,3 +1,5 @@ #!/bin/sh +make all + TZ=/usr/share/zoneinfo/UTC NODE_ENV=development DEBUG=* node server.js diff --git a/package.json b/package.json index 760c039..48fd35a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "async": "~0.1.22", - "bootstrap": "git://github.com/twitter/bootstrap.git", + "bootstrap": "git://github.com/langpavel/bootstrap.git", "browserify": "~1.14.5", "colors": "~0.6.0-1", "commander": "~0.6.1", @@ -22,7 +22,7 @@ "mysql": "~2.0.0-alpha3", "nib": "~0.7.0", "redis": "~0.7.2", - "showdown": "0.2.0", + "showdown": "~0.2.0", "socket.io": "~0.9.9", "stylus": "~0.28.2", "uglify-js": "~1.3.3" diff --git a/pages/markdown.md b/pages/markdown.md index 8879bc1..1df762d 100644 --- a/pages/markdown.md +++ b/pages/markdown.md @@ -2,6 +2,10 @@ NOTE -- Showdown on GitHub ========================== +\- +– +— + Please note that I, Corey, am not the author of Showdown. Rather, I found it some time back at (website removed, see: ) diff --git a/production b/production index 34b4b27..c52d3cf 100755 --- a/production +++ b/production @@ -1,3 +1,5 @@ #!/bin/sh +make all + TZ=/usr/share/zoneinfo/UTC NODE_ENV=production node server.js