Skip to content

Commit

Permalink
New release 1.2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbrand committed Feb 25, 2017
1 parent d662e81 commit ff2457f
Show file tree
Hide file tree
Showing 5 changed files with 834 additions and 383 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Strophe.js Change Log

## Version 1.2.13 - Unreleased
## Version 1.2.13 - 2017-02-25

* Use almond to create the build. This means that the build itself is an AMD
module and can be loaded via `require`.
Expand Down
25 changes: 16 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ STROPHE = strophe.js
STROPHE_MIN = strophe.min.js
STROPHE_LIGHT = strophe-no-polyfill.js

all: doc $(STROPHE) $(STROPHE_MIN)

.PHONY: help
help:
@echo "Please use \`make <target>' where <target> is one of the following:"
Expand All @@ -21,8 +23,6 @@ help:
@echo " serve Serve this directory via a webserver on port 8000."
@echo " stamp-npm Install NPM dependencies and create the guard file stamp-npm which will prevent those dependencies from being installed again."

all: doc $(STROPHE_MIN)

stamp-npm: package.json
npm install
touch stamp-npm
Expand All @@ -45,19 +45,26 @@ doc:
@@echo

.PHONY: release
release: $(STROPHE) $(STROPHE_MIN) $(STROPHE_LIGHT)
release:
sed -i 's/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/' package.json
sed -i "s/Unreleased/`date +%Y-%m-%d`/" CHANGELOG.md
make dist
make doc

.PHONE: dist
dist: $(STROPHE) $(STROPHE_MIN) $(STROPHE_LIGHT)

$(STROPHE_MIN): src node_modules Makefile
$(RJS) -o build.js insertRequire=strophe-polyfill include=strophe-polyfill out=strophe.min.js
sed -i s/@VERSION@/$(VERSION)/ strophe.min.js
$(RJS) -o build.js insertRequire=strophe-polyfill include=strophe-polyfill out=$(STROPHE_MIN)
sed -i s/@VERSION@/$(VERSION)/ $(STROPHE_MIN)

$(STROPHE): src node_modules Makefile
$(RJS) -o build.js optimize=none insertRequire=strophe-polyfill include=strophe-polyfill out=strophe.js
sed -i s/@VERSION@/$(VERSION)/ strophe.js
$(RJS) -o build.js optimize=none insertRequire=strophe-polyfill include=strophe-polyfill out=$(STROPHE)
sed -i s/@VERSION@/$(VERSION)/ $(STROPHE)

$(STROPHE_LIGHT): src node_modules Makefile
$(RJS) -o build.js optimize=none out=strophe.light.js
sed -i s/@VERSION@/$(VERSION)/ strophe.light.js
$(RJS) -o build.js optimize=none out=$(STROPHE_LIGHT)
sed -i s/@VERSION@/$(VERSION)/ $(STROPHE_LIGHT)

.PHONY: jshint
jshint: stamp-bower
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "strophe.js",
"description": "Strophe.js is an XMPP library for JavaScript",
"version": "1.2.12",
"version": "1.2.13",
"homepage": "http://strophe.im/strophejs",
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit ff2457f

Please sign in to comment.