Permalink
Browse files

Merge pull request #132 from alankligman/develop

Added README files to services that aren't yet working. Updated Makefile...
  • Loading branch information...
2 parents 891f408 + 015e72e commit e27fcacf41d2a527e9dc762ec2ffc0c916b14f14 @dmose dmose committed Apr 11, 2012
Showing with 7 additions and 4 deletions.
  1. +5 −4 Makefile
  2. +1 −0 src/logic/action-list/README
  3. +1 −0 src/sound/README
View
@@ -28,13 +28,13 @@ GLADIUS_JSHINT_DIRS := $(SRC_DIR) $(TEST_DIR) ./example/collada \
example/sprites example/cube example/collision-cubes example/no-comply
-compile = node $(TOOLS_DIR)/node_modules/uglify-js/bin/uglifyjs -o $(1) $(GLADIUS_DIST)
+compile = node $(TOOLS_DIR)/node_modules/uglify-js/bin/uglifyjs --output $(1) $(GLADIUS_DIST)
complete = cat $(GLADIUS_MIN) > $(1)
.PHONY: check-lint
-all: $(DIST_DIR) $(GLADIUS_DIST) $(GLADIUS_MIN) $(CUBICVR_LIB)
+all: $(DIST_DIR) $(GLADIUS_DIST) $(CUBICVR_LIB)
@@echo "Finished, see $(DIST_DIR)"
$(DIST_DIR):
@@ -53,9 +53,10 @@ $(GLADIUS_MIN): $(DIST_DIR) $(GLADIUS_SRC)
@@echo "Building $(GLADIUS_MIN)"
@@$(call compile,$(GLADIUS_MIN))
-test: $(DIST_DIR) $(GLADIUS_MIN)
+minify: $(GLADIUS_MIN)
+
+test: $(DIST_DIR)
@@echo "Creating tests in $(DIST_TEST_DIR)"
- @@mv $(GLADIUS_MIN) $(GLADIUS_DIST)
@@cp -R $(TEST_DIR) $(DIST_DIR)
@@mv $(DIST_TEST_DIR)/index.html.dist $(DIST_TEST_DIR)/index.html
@@mkdir -p $(DIST_TOOLS_DIR)/qunit
@@ -0,0 +1 @@
+This is experimental and does not yet function.
View
@@ -0,0 +1 @@
+This is experimental and does not yet function.

0 comments on commit e27fcac

Please sign in to comment.