Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Bug 1308 - Include wrappers in popcorn-complete.js

  • Loading branch information...
commit 2106532cb724577a9485b521596f119dfa5c115a 1 parent 8bac29d
Jon Buckley authored

Showing 1 changed file with 12 additions and 12 deletions. Show diff stats Hide diff stats

  1. 24  Makefile
24  Makefile
@@ -92,7 +92,7 @@ WRAPPERS_UNIT := $(shell find $(WRAPPERS_DIR) -name 'popcorn.*.unit.js' -print)
92 92
 # popcorn + plugins
93 93
 POPCORN_COMPLETE_LIST := --js ${POPCORN_SRC} \
94 94
                          $(shell for js in ${MODULES_SRC} ; do echo --js $$js ; done) \
95  
-                         $(shell for js in $(WRAPPERS_SRC) ; do echo --js $$js ; done) \
  95
+                         $(shell for js in ${WRAPPERS_SRC} ; do echo --js $$js ; done) \
96 96
                          $(shell for js in ${EFFECTS_SRC} ; do echo --js $$js ; done) \
97 97
                          $(shell for js in ${PLUGINS_SRC} ; do echo --js $$js ; done) \
98 98
                          $(shell for js in ${PARSERS_SRC} ; do echo --js $$js ; done) \
@@ -122,7 +122,7 @@ add_version = cat $(1) | sed -e 's/@VERSION/${VERSION}/' > $(1).__tmp__ ; \
122 122
 # Run the file through jslint
123 123
 run_lint = @@$(RHINO) build/jslint-check.js $(1)
124 124
 
125  
-all: setup popcorn plugins parsers players effects complete min ie8
  125
+all: setup popcorn modules wrappers plugins parsers players effects complete min ie8
126 126
 	@@echo "Popcorn build complete.  To create a testing mirror, run: make testing."
127 127
 
128 128
 check: lint lint-plugins lint-parsers lint-players lint-effects lint-modules lint-wrappers
@@ -162,15 +162,15 @@ ${MODULES_DIST}: ${MODULES_SRC} ${DIST_DIR}
162 162
 	@@echo "Building ${MODULES_DIST}"
163 163
 	@@cat ${MODULES_SRC} > ${MODULES_DIST}
164 164
 
165  
-wrappers: setup $(WRAPPERS_DIST)
  165
+wrappers: setup ${WRAPPERS_DIST}
166 166
 
167  
-$(WRAPPERS_MIN): $(WRAPPERS_DIST)
168  
-	@@echo "Building" $(WRAPPERS_MIN)
169  
-	@@$(call compile, $(shell for js in $(WRAPPERS_SRC) ; do echo --js $$js ; done), $(WRAPPERS_MIN))
  167
+${WRAPPERS_MIN}: ${WRAPPERS_DIST}
  168
+	@@echo "Building ${WRAPPERS_MIN}"
  169
+	@@$(call compile, $(shell for js in ${WRAPPERS_SRC} ; do echo --js $$js ; done), ${WRAPPERS_MIN})
170 170
 
171  
-$(WRAPPERS_DIST): $(WRAPPERS_SRC) $(DIST_DIR)
172  
-	@@echo "Building $(WRAPPERS_DIST)"
173  
-	@@cat $(WRAPPERS_SRC) > $(WRAPPERS_DIST)
  171
+${WRAPPERS_DIST}: ${WRAPPERS_SRC) ${DIST_DIR}
  172
+	@@echo "Building ${WRAPPERS_DIST}"
  173
+	@@cat ${WRAPPERS_SRC} > ${WRAPPERS_DIST}
174 174
 
175 175
 plugins: ${PLUGINS_DIST}
176 176
 
@@ -212,9 +212,9 @@ $(EFFECTS_DIST): $(EFFECTS_SRC) $(DIST_DIR)
212 212
 	@@echo "Building $(EFFECTS_DIST)"
213 213
 	@@cat $(EFFECTS_SRC) > $(EFFECTS_DIST)
214 214
 
215  
-complete: setup ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
216  
-	@@echo "Building popcorn + modules + plugins + parsers + players + effects..."
217  
-	@@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > $(POPCORN_COMPLETE_DIST)
  215
+complete: setup ${POPCORN_SRC} ${MODULES_SRC} ${WRAPPERS_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
  216
+	@@echo "Building popcorn + modules + wrappers + plugins + parsers + players + effects..."
  217
+	@@cat ${POPCORN_SRC} ${MODULES_SRC} ${WRAPPERS_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > $(POPCORN_COMPLETE_DIST)
218 218
 	@@$(call add_license, $(POPCORN_COMPLETE_DIST))
219 219
 	@@$(call add_version, $(POPCORN_COMPLETE_DIST))
220 220
 

0 notes on commit 2106532

Please sign in to comment.
Something went wrong with that request. Please try again.