Permalink
Browse files

Gitinores updated and silly Makefiles removed.

  • Loading branch information...
1 parent bf58709 commit 4ac7bf2acac03bdacc64129c88bebb3ad6a48078 @secretrobotron committed Dec 7, 2011
Showing with 2 additions and 77 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 butter/.gitignore
  3. +0 −77 butter/Makefile.bak
View
@@ -9,3 +9,4 @@ server/include
server/lib
assets
.DS_Store
+butter/src/previewer/build
View
@@ -1,3 +1,4 @@
*.swp
*~
dist
+src/previewer/build
View
@@ -1,77 +0,0 @@
-
-BUTTER := butter
-SRC_DIR := .
-DIST_DIR := $(SRC_DIR)/dist
-DIST_LIB_DIR := $(DIST_DIR)/lib
-DIST_CSS_DIR := $(DIST_DIR)/css
-BUTTER_DIST := $(DIST_DIR)/$(BUTTER).js
-BUTTER_MIN := $(DIST_DIR)/$(BUTTER).min.js
-BUTTER_HEAVY := $(DIST_DIR)/$(BUTTER).heavy.js
-BUTTER_HEAVY_CSS := $(DIST_DIR)/$(BUTTER).heavy.css
-SOURCE_DIR := $(SRC_DIR)/src
-MODULES_DIR := $(SOURCE_DIR)/modules
-EXTERNAL_DIR := $(SRC_DIR)/external
-TOOLS_DIR := $(SRC_DIR)/tools
-
-MISC_LIBS := \
- $(MODULES_DIR)/eventeditor/defaultEditor.html
-
-JS_LIBS := \
- $(EXTERNAL_DIR)/jquery/jquery.js \
- $(EXTERNAL_DIR)/jquery-ui/jquery-ui.min.js \
- $(EXTERNAL_DIR)/trackLiner/trackLiner.js \
- $(MODULES_DIR)/previewer/butter.preview-link.js \
- $(MODULES_DIR)/butter.comm.js
-
-JS_SRCS := \
- $(SOURCE_DIR)/butter.js \
- $(MODULES_DIR)/butter.comm.js \
- $(MODULES_DIR)/plugintray/butter.plugintray.js \
- $(MODULES_DIR)/eventeditor/butter.eventeditor.js \
- $(MODULES_DIR)/previewer/butter.previewer.js \
- $(MODULES_DIR)/timeline/butter.timeline.js \
- $(MODULES_DIR)/previewer/butter.preview-link.js \
- $(MODULES_DIR)/trackeditor/butter.trackeditor.js
-
-CSS_SRCS := \
- $(EXTERNAL_DIR)/jquery-ui/jquery-ui-1.8.5.custom.css \
- $(EXTERNAL_DIR)/trackLiner/trackLiner.css
-
-compile = java -jar $(TOOLS_DIR)/closure/compiler.jar \
- $(shell for js in $(JS_SRCS) ; do echo --js $$js ; done) \
- --compilation_level SIMPLE_OPTIMIZATIONS \
- --js_output_file $(1)
-
-all: $(DIST_DIR) $(BUTTER_DIST)
- @@echo "Finished, see $(DIST_DIR)"
-
-$(BUTTER_HEAVY_CSS):
- @@echo "Building $(BUTTER_HEAVY_CSS)"
- @@cat $(CSS_SRCS) >> $(BUTTER_HEAVY_CSS)
-
-$(BUTTER_HEAVY): $(DIST_DIR) $(BUTTER_DIST) $(BUTTER_MIN) $(BUTTER_HEAVY_CSS)
- @@echo "Building $(BUTTER_HEAVY)"
- @@cat $(JS_LIBS) > $(BUTTER_HEAVY)
- @@cat $(BUTTER_MIN) >> $(BUTTER_HEAVY)
-
-$(BUTTER_MIN): $(DIST_DIR) $(BUTTER_DIST)
- @@echo "Building $(BUTTER_MIN)"
- @@$(call compile,$(BUTTER_MIN))
-
-$(BUTTER_DIST): $(DIST_DIR)
- @@echo "Building $(BUTTER_DIST)"
- @@cp $(CSS_SRCS) $(DIST_CSS_DIR)
- @@cp $(JS_LIBS) $(DIST_LIB_DIR)
- @@cp $(MISC_LIBS) $(DIST_LIB_DIR)
- @@cat $(JS_SRCS) > $(BUTTER_DIST)
-
-$(DIST_DIR):
- @@echo "Creating $(DIST_DIR)"
- @@mkdir $(DIST_DIR)
- @@echo "Creating $(DIST_LIB_DIR)"
- @@mkdir $(DIST_LIB_DIR)
- @@echo "Creating $(DIST_CSS_DIR)"
- @@mkdir $(DIST_CSS_DIR)
-
-clean:
- @@rm -fr $(DIST_DIR)

0 comments on commit 4ac7bf2

Please sign in to comment.