Skip to content

Commit

Permalink
Change version and build naming logic
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Pulges committed Dec 12, 2013
1 parent 14f2586 commit 8b2b8e9
Show file tree
Hide file tree
Showing 8 changed files with 17,855 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.textile
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
*wysihtml5x 0.4.0* (Dec 12, 2013)
* Changed syntax of background and foreground color with style commands
* Anchor creting and removing logic changed
* Default build is without internal toolbar functions and build with "-toolbar" suffix contains default toolbar functions

*wysihtml5x 0.4.0-beta2* (Nov 7, 2013)
* Support for contenteditable without iframe sandbox when initiated on div instead of textarea
* Table creation and handling commands added
Expand Down
29 changes: 14 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = $(shell cat version.txt)

JS_OUTPUT = "dist/wysihtml5x-${VERSION}.js"
JS_OUTPUT_WOTOOLS = "dist/wysihtml5x-${VERSION}-wotools.js"
JS_OUTPUT = "dist/wysihtml5x-${VERSION}-toolbar.js"
JS_OUTPUT_WOTOOLS = "dist/wysihtml5x-${VERSION}.js"

OPEN = $(shell which xdg-open || which gnome-open || which open)

Expand Down Expand Up @@ -178,29 +178,28 @@ JS_FILES_WOTOOLS = src/wysihtml5.js \
all: bundle minify

bundle:
@@echo "Bundling..."
@@touch ${JS_OUTPUT}
@@rm ${JS_OUTPUT}
@@cat ${JS_FILES} >> ${JS_OUTPUT}
@@cat ${JS_OUTPUT} | sed "s/@VERSION/${VERSION}/" > "${JS_OUTPUT}.tmp"
@@mv "${JS_OUTPUT}.tmp" ${JS_OUTPUT}

minify:
@@echo "Minifying... (this requires node.js)"
@@node build/minify.js ${JS_OUTPUT}
@@echo "Done."

wotoolbar:
@@echo "Bundling..."
@@touch ${JS_OUTPUT_WOTOOLS}
@@rm ${JS_OUTPUT_WOTOOLS}
@@cat ${JS_FILES_WOTOOLS} >> ${JS_OUTPUT_WOTOOLS}
@@cat ${JS_OUTPUT_WOTOOLS} | sed "s/@VERSION/${VERSION}/" > "${JS_OUTPUT}-wotools.tmp"
@@mv "${JS_OUTPUT}-wotools.tmp" ${JS_OUTPUT_WOTOOLS}

minify:
@@echo "Minifying... (this requires node.js)"
@@node build/minify.js ${JS_OUTPUT_WOTOOLS}
@@echo "Done."

toolbar:
@@echo "Bundling..."
@@touch ${JS_OUTPUT}
@@rm ${JS_OUTPUT}
@@cat ${JS_FILES} >> ${JS_OUTPUT}
@@cat ${JS_OUTPUT} | sed "s/@VERSION/${VERSION}/" > "${JS_OUTPUT}.tmp"
@@mv "${JS_OUTPUT}.tmp" ${JS_OUTPUT}
@@echo "Minifying... (this requires node.js)"
@@node build/minify.js ${JS_OUTPUT}
@@echo "Done."

unittest:
@@${OPEN} test/index.html
Expand Down
2 changes: 2 additions & 0 deletions README.textile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Extended features not present in xing/wysihtml5 0.4.0pre
* Improved formatblock handling
* Ability for user to remove formating with only collapsed caret. (without having to select exactly whole text)
* Improved speed
* Anchor creting and removing logic changed to more universal
* Default build is without internal toolbar functions and build with "-toolbar" suffix contains default toolbar functions

h2. Browser Support

Expand Down
8,936 changes: 8,936 additions & 0 deletions dist/wysihtml5x-0.4.0-toolbar.js

Large diffs are not rendered by default.

336 changes: 336 additions & 0 deletions dist/wysihtml5x-0.4.0-toolbar.min.js

Large diffs are not rendered by default.

8,245 changes: 8,245 additions & 0 deletions dist/wysihtml5x-0.4.0.js

Large diffs are not rendered by default.

316 changes: 316 additions & 0 deletions dist/wysihtml5x-0.4.0.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0-beta2
0.4.0

0 comments on commit 8b2b8e9

Please sign in to comment.