Skip to content

Commit

Permalink
new target 'polling' to do away with separate Makefile.http_polling
Browse files Browse the repository at this point in the history
  • Loading branch information
sstrigler committed Sep 7, 2012
1 parent 1fd25c2 commit d4c1319
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 74 deletions.
31 changes: 25 additions & 6 deletions Makefile
Expand Up @@ -9,19 +9,38 @@ src/JSJaCHttpBindingConnection.js src/JSJaCWebSocketConnection.js \
src/JSJaCFBApplication.js \
src/JSJaC.js

POLLING_SRC=src/jsextras.js src/crypt.js src/JSJaCJSON.js src/xmlextras.js \
src/JSJaCBuilder.js src/JSJaCConstants.js \
src/JSJaCConsoleLogger.js src/JSJaCCookie.js src/JSJaCError.js \
src/JSJaCJID.js src/JSJaCKeys.js src/JSJaCPacket.js src/JSJaCConnection.js \
src/JSJaCHttpPollingConnection.js \
src/JSJaCFBApplication.js \
src/JSJaC.js

all: clean utils install doc
polling: clean utils polling_install doc

install: build uncompressed crunch
install: build uncompressed crunch
@echo "done."

build:
polling_install: polling_build uncompressed crunch
@echo "done."

build:
@echo "building ...";
@for i in ${SRC}; do \
echo "\t$$i"; \
cat "$$i" >> $(OUTFILE); \
done

crunch:
polling_build:
@echo "building ...";
@for i in ${POLLING_SRC}; do \
echo "\t$$i"; \
cat "$$i" >> $(OUTFILE); \
done

crunch:
@echo "crunching ..."
@if [ -e $(OUTFILE) ]; then \
utils/jsmin < $(OUTFILE) > $(OUTFILE).tmp && \
Expand All @@ -33,7 +52,7 @@ crunch:

pack: clean utils build moo crunch doc

moo:
moo:
@echo "packing..."
@if [ -e $(OUTFILE) ]; then \
php ./utils/packer/pack.php $(OUTFILE) $(PACKFILE).tmp && \
Expand All @@ -45,7 +64,7 @@ moo:
echo "$(OUTFILE) not found. build failed?"; \
fi

doc:
doc:
@utils/jsdoc3/jsdoc -d doc src/

utils:
Expand All @@ -57,7 +76,7 @@ clean:
@rm -rf doc/
@make -C utils clean

uncompressed:
uncompressed:
@if [ -e $(OUTFILE) ]; then \
cat src/header.js > $(UNCOMPRESSED) && \
cat src/JSJaCConfig.js >> $(UNCOMPRESSED) && \
Expand Down
67 changes: 0 additions & 67 deletions Makefile.http_polling

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -16,7 +16,7 @@ like prototype, mootools, jQuery, dojo and YUI!.
**Note**: As security restrictions of most modern browsers prevent
HTTP Polling from being usable anymore this module is disabled by
default now. If you want to compile it in use
Makefile.http\_polling.
'make polling'.

License
-------
Expand Down

0 comments on commit d4c1319

Please sign in to comment.