Merge branch 'develop'

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Lars Jung, http://larsjung.de
+Copyright (c) 2014 Lars Jung, http://larsjung.de
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -11,6 +11,11 @@ Kudos to [jquery.qrcode.js](https://github.com/jeromeetienne/jquery-qrcode).
 ## Changelog
 
 
+### v0.8.0 - *2014-07-07*
+
+* adds bower support
+
+
 ### v0.7.0 - *2013-08-17*
 
 * some fixes

bower.json

@@ -0,0 +1,25 @@
+{
+  "name": "jquery.qrcode",
+  "version": "0.8.0",
+  "homepage": "http://larsjung.de/qrcode/",
+  "authors": [
+    "Lars Jung <lrsjng@gmail.com>"
+  ],
+  "description": "generate QR codes dynamically",
+  "main": "dist/jquery.qrcode.js",
+  "keywords": [
+    "jquery",
+    "javascript",
+    "qrcode"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests",
+    "build",
+    "local"
+  ]
+}

makefile.js

@@ -12,6 +12,7 @@ module.exports = function (make) {
 
 		root = path.resolve(__dirname),
 		src = path.join(root, 'src'),
+		dist = path.join(root, 'dist'),
 		build = path.join(root, 'build');
 
 
@@ -82,13 +83,15 @@ module.exports = function (make) {
 	});
 
 
-	make.target('build', ['check-version'], 'build all updated files').sync(function () {
+	make.target('build', ['check-version', 'clean'], 'build all files').sync(function () {
 
 		$(src + ': jquery.qrcode.js')
 			.includify()
 			.handlebars(make.env)
+			.WRITE($.map.p(src, dist))
 			.WRITE($.map.p(src, build).s('.js', '-' + pkg.version + '.js'))
 			.uglifyjs()
+			.WRITE($.map.p(src, dist).s('.js', '.min.js'))
 			.WRITE($.map.p(src, build).s('.js', '-' + pkg.version + '.min.js'));
 
 		$(src + ': **, ! *.js')
@@ -101,7 +104,7 @@ module.exports = function (make) {
 	});
 
 
-	make.target('release', ['clean', 'build'], 'create a zipball').async(function (done, fail) {
+	make.target('release', ['build'], 'create a zipball').async(function (done, fail) {
 
 		$(build + ': **').shzip({
 			target: path.join(build, pkg.name + '-' + pkg.version + '.zip'),

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery.qrcode",
   "displayName": "jQuery.qrcode",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "generate QR codes dynamically",
   "url": "http://larsjung.de/qrcode/",
   "author": "Lars Jung",