Merge pull request #139 from athenalabs/makefile

new build sys.

Author: jbenet

.gitmodules

@@ -0,0 +1,77 @@
+
+JS = build/acorn.player.js
+
+CSS = build/acorn.player.css
+
+JS_SRC = $(shell find coffee | grep .coffee | sed 's/coffee\//build\/js-compiled\//g' | sed 's/\.coffee/\.js/g' )
+
+
+all: build
+
+.PHONY: clean test watch
+
+test:
+	# probably broken?
+	@npm test
+
+clean:
+	rm -rf -- build
+
+
+# css
+build/acorn.player.css: less/acorn-player.less
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	node_modules/.bin/lessc $< $@
+
+build/acorn.player.min.css: build/acorn.player.css
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	cat $< | node_modules/.bin/cssmin > $@
+
+
+# coffee
+build/js-compiled/%.js: coffee/%.coffee
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	node_modules/.bin/coffee -b -p -c $< > $@
+
+
+# js
+build/acorn.player.js: $(JS_SRC) package.json
+	#: $(shell node_modules/.bin/smash --list build/js-compiled/src/)
+	# use JS_SRC here because the index.js (for smash --list) is an intermediate
+	# file, which gets constructed.
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	node_modules/.bin/smash build/js-compiled/src/ | node_modules/.bin/uglifyjs - -b indent-level=2 -o $@
+
+
+# minification
+build/%.min.js: build/%.js
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	node_modules/.bin/uglifyjs $< > $@
+
+
+# build
+build: build/acorn.player.min.js build/acorn.player.min.css
+
+
+# dist
+dist: build
+	cp -r $< $@
+
+
+# serve
+serve:
+	@echo "Serving static files..."
+	@node_modules/.bin/http-server -p 8000
+
+# watching
+watch:
+	@echo "Serving static files..."
+	@node_modules/.bin/http-server -p 8000 &
+	@echo "Watching files for changes..."
+	@watchr -e "watch('(less|coffee|lib)\/.*\.(less|coffee|css)') { system 'make' }"
+

Gruntfile.coffee

@@ -6,14 +6,9 @@
 #  For all details and documentation:
 #  http://github.com/athenalabs/acorn-player
 
-goog.provide 'acorn'
-
-goog.require 'acorn.Model'
-
-
-acorn_ = (data) ->
+acorn = (data) ->
   acorn.Model.withData data
 
-# patch the global `acorn` object as this function
-_.extend acorn_, acorn
-acorn = acorn_
+acorn.shells = {}
+acorn.player = {}
+acorn.player.controls = {}

Makefile

@@ -1,9 +1,7 @@
 if typeof acorn is 'undefined'
   acorn = {}
 
-goog.provide 'acorn.config'
-
-_.extend acorn.config,
+acorn.config =
   version: '0.0.0'
   url:
     base: 'https://acorn.athena.ai'

coffee/src/acorn.coffee

@@ -1,6 +1,5 @@
-goog.provide 'acorn.errors'
-
 
+acorn.errors = {}
 
 APIError = acorn.errors.APIError = (description) ->
   throw new Error "Acorn API Error: #{description}"

coffee/src/config.coffee

@@ -0,0 +1,16 @@
+`(function(){`
+
+`import "acorn"`
+`import "errors"`
+`import "config"`
+`import "util/"`
+`import "media"`
+`import "model"`
+`import "player"`
+`import "shells/"`
+`import "views/"`
+
+acorn.previousAcorn = @acorn
+@acorn = acorn
+
+`}).call(this.exports || this)`

coffee/src/errors.coffee

@@ -1,4 +1,3 @@
-goog.provide 'acorn.MediaInterface'
 
 
 ###

coffee/src/index.coffee

@@ -1,6 +1,4 @@
-goog.provide 'acorn.Model'
-
-goog.require 'acorn.util'
+`import "util/"`