[CONF] Makefile update

Francois-Xavier Gentilhomme · Francois-Xavier Gentilhomme · commit 42601b73b125 · 2016-04-08T17:18:19.000+02:00
diff --git a/Makefile b/Makefile
@@ -13,7 +13,9 @@ purge:
 clean:
 
 prepare:
-	@bower install
+	@git remote add github $(GITHUB) > /dev/null; true
+	@git fetch --tags
+	@bower install && bower link
 
 watch:
 
diff --git a/Makefile.inc b/Makefile.inc
@@ -6,3 +6,5 @@ MAKE := $(MAKE) --no-print-directory
 NPM_CACHE = $(HOME)/.npm
 
 CURRENT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+GITHUB = https://github.com/MyScript/myscript-text-web.git
diff --git a/bower.json b/bower.json
@@ -1,42 +1,45 @@
 {
-    "name": "myscript-text-web",
-    "version": "1.2.0",
-    "description": "HTML5 Element easing integration of MyScript text handwriting recognition in your web-page",
-    "keywords": [
-        "web-component",
-        "web-components",
-        "polymer",
-        "myscript",
-        "education",
-        "write",
-        "text",
-        "handwriting",
-        "recognition"
-    ],
-    "main": "myscript-text-web.html",
-    "license": "Apache-2",
-    "homepage": "https://myscript.github.io/myscript-text-web/components/myscript-text-web/",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/MyScript/myscript-text-web.git"
-    },
-    "ignore": [
-        "**/.*",
-        "node_modules",
-        "bower_components",
-        "tests",
-        "test"
-    ],
-    "dependencies": {
-        "polymer": "Polymer/polymer#1.4.x",
-        "myscript-common-element": "https://zen.visionobjects.com/git/WS/Polymer/myscript-common-element.git#master"
-    },
-    "devDependencies": {
-        "iron-component-page": "PolymerElements/iron-component-page#1.1.x",
-        "iron-flex-layout": "PolymerElements/iron-flex-layout#1.3.x",
-        "iron-ajax": "PolymerElements/iron-ajax#1.2.x",
-        "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#1.1.x",
-        "paper-listbox": "PolymerElements/paper-listbox#1.1.x",
-        "paper-item": "PolymerElements/paper-item#1.1.x"
-    }
+  "name": "myscript-text-web",
+  "version": "1.2.0",
+  "description": "HTML5 Element easing integration of MyScript text handwriting recognition in your web-page",
+  "keywords": [
+    "web-component",
+    "web-components",
+    "polymer",
+    "myscript",
+    "education",
+    "write",
+    "text",
+    "handwriting",
+    "recognition"
+  ],
+  "main": "myscript-text-web.html",
+  "license": "Apache-2",
+  "homepage": "https://myscript.github.io/myscript-text-web/components/myscript-text-web/",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/MyScript/myscript-text-web.git"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "tests",
+    "test"
+  ],
+  "dependencies": {
+    "polymer": "Polymer/polymer#1.4.x",
+    "myscript-common-element": "https://zen.visionobjects.com/git/WS/Polymer/myscript-common-element.git#master"
+  },
+  "devDependencies": {
+    "iron-component-page": "PolymerElements/iron-component-page#1.1.x",
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#1.3.x",
+    "iron-ajax": "PolymerElements/iron-ajax#1.2.x",
+    "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#1.1.x",
+    "paper-listbox": "PolymerElements/paper-listbox#1.1.x",
+    "paper-item": "PolymerElements/paper-item#1.1.x"
+  },
+  "resolutions": {
+    "myscript": "master"
+  }
 }
