Framer 3

.gitignore

@@ -3,4 +3,5 @@ node_modules
 test/init.js
 test/lib/framer.js
 *.swp
-build/template
+build/template
+build

Makefile

@@ -1,38 +1,86 @@
+bin = ./node_modules/.bin
+coffee = $(bin)/coffee
+
+browserify = $(bin)/browserify -t coffeeify -d --extension=".coffee"
+watch = $(coffee) scripts/watch.coffee framer,test/tests
+githash = `git rev-parse --short HEAD`
+
 all: build
 
 build:
-	make lint
-	# make clean
+	make clean
 	mkdir -p build
-	./node_modules/coffee-script/bin/coffee scripts/banner.coffee > build/framer.js
-	./node_modules/browserify/bin/cmd.js src/init.coffee >> build/framer.js
+	# $(coffee) scripts/banner.coffee > build/framer.debug.js
+	$(browserify) framer/Framer.coffee >> build/framer.debug.js
+	cat build/framer.debug.js | $(bin)/exorcist build/framer.js.map > build/framer.js
+	$(bin)/uglifyjs \
+		--in-source-map build/framer.js.map \
+		--source-map build/framer.min.js.map build/framer.js \
+	> build/framer.min.js
+	# Copy the file over to the cactus project
+	cp build/framer.js extras/CactusFramer/static/framer.js
+	cp build/framer.js.map extras/CactusFramer/static/framer.js.map
 buildw:
-	./node_modules/coffee-script/bin/coffee scripts/watch.coffee . make build
+	$(watch) make build
+
+clean:
+	rm -rf build
+
+
+# Testing
 
 test:
-	make
+	make lint
+	make build
 	mkdir -p test/lib
-	cp build/framer.js test/lib/framer.js
-	./node_modules/browserify/bin/cmd.js test/init.coffee -o test/init.js
-	./node_modules/mocha-phantomjs/bin/mocha-phantomjs test/index.html
+	$(browserify) test/init.coffee -o test/init.js
+	$(bin)/mocha-phantomjs test/index.html
 testw:
-	./node_modules/coffee-script/bin/coffee scripts/watch.coffee . make test
+	$(watch) make test
 
-clean:
-	rm -rf build
+safari:
+	make build
+	mkdir -p test/lib
+	$(browserify) test/init.coffee -o test/init.js
+	# $(bin)/mocha-phantomjs test/index.html
+	open -g -a Safari test/index.html
+safariw:
+	$(watch) make safari
 
-lint:
-	./node_modules/coffeelint/bin/coffeelint -f lint.config.json -r src
+
+# Building and uploading the site
 
 dist:
-	make clean
 	make build
-	cp -R template build/Framer
-	cp build/framer.js build/Framer/framer.js
+	mkdir -p build/Framer
+	cp -R templates/Project build/Framer/Project
+	rm -Rf build/Framer/Project/framer
+	mkdir -p build/Framer/Project/framer
+	cp build/framer.js build/Framer/Project/framer/framer.js
+	cp build/framer.js.map build/Framer/Project/framer/framer.js.map
+	find build/Framer -name ".DS_Store" -depth -exec rm {} \;
 	cd build; zip -r Framer.zip Framer
 
-cactus:
-	cd extras/CactusFramerTest; cactus serve
+site%build:
+	make dist
+	mkdir -p build/builds.framerjs.com
+	$(coffee) scripts/site-deploy.coffee build
+	cp -R extras/builds.framerjs.com/static build/builds.framerjs.com/static
+	mkdir -p build/builds.framerjs.com/latest
+	cp build/*.js build/builds.framerjs.com/latest
+	cp build/*.map build/builds.framerjs.com/latest
+	cp build/*.zip build/builds.framerjs.com/latest
+	cp -R build/builds.framerjs.com/latest build/builds.framerjs.com/$(githash)
+
+site%upload:
+	make site:build
+	$(coffee) scripts/site-deploy.coffee upload
 
-.PHONY: build clean lint test
+deploy:
+	make site:build
+	make site:upload
+
+lint:
+	./node_modules/.bin/coffeelint -f coffeelint.json -r framer
 
+.PHONY: all build test clean