Skip to content
This repository was archived by the owner on Jan 4, 2021. It is now read-only.

Commit 1eec5f4

Browse files
author
Francois-Xavier Gentilhomme
committed
v1.0.4 Release samples README and Travis update
1 parent 4b6bb04 commit 1eec5f4

File tree

33 files changed

+200
-129
lines changed

33 files changed

+200
-129
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*.xml
44
*.idea
55
.tmp
6+
release.sh
67
node_modules
78
bower_components
89
test_results

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ node_js:
33
- '0.10'
44
before_install: npm install -g grunt-cli
55
install: npm install && bower install
6-
before_script: grunt build && grunt compress
6+
before_script: grunt
77
deploy:
88
- provider: npm
99

Gruntfile.js

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@ module.exports = function (grunt) {
9191
concat: {
9292
default: {
9393
options: {
94-
sourceMap: true
94+
sourceMap: true,
95+
banner: '/*\n <%= pkg.name %> - <%= pkg.description %>\n Version: <%= pkg.version %>\n License: <%= pkg.license %>\n */\n'
9596
},
96-
src: '<%= fileList %>',
97-
dest: '<%= project.tmp %>/<%= pkg.name %>.js'
98-
},
99-
raw: {
10097
src: '<%= fileList %>',
10198
dest: '<%= project.dist %>/<%= pkg.name %>.js'
10299
}
@@ -107,14 +104,15 @@ module.exports = function (grunt) {
107104
mangle: false,
108105
nonull: true,
109106
sourceMap: true,
110-
sourceMapIn: '<%= project.tmp %>/<%= pkg.name %>.js.map',
107+
sourceMapIncludeSources: false,
108+
sourceMapIn: '<%= project.dist %>/<%= pkg.name %>.js.map',
111109
banner: '/*\n <%= pkg.name %> - <%= pkg.description %>\n Version: <%= pkg.version %>\n License: <%= pkg.license %>\n */'
112110
},
113111
default: {
114112
files: [{
115113
expand: true,
116114
flatten: true,
117-
cwd: '<%= project.tmp %>',
115+
cwd: '<%= project.dist %>',
118116
src: '<%= pkg.name %>.js',
119117
dest: '<%= project.dist %>',
120118
ext: '.min.js'
@@ -206,15 +204,16 @@ module.exports = function (grunt) {
206204
'cryptojslib/components/hmac-min.js',
207205
'q/q.js'
208206
]
209-
}]
210-
},
211-
readme: {
212-
files: [{
207+
}, {
213208
expand: true,
214209
dot: true,
215-
cwd: '',
216-
dest: '<%= project.dist %>',
217-
src: ['README.md']
210+
flatten: true,
211+
cwd: '<%= project.dist %>',
212+
dest: '<%= project.dist %>/<%= project.samples %>/lib',
213+
src: [
214+
'myscript.min.js',
215+
'myscript.min.js.map'
216+
]
218217
}]
219218
}
220219
},
@@ -236,13 +235,6 @@ module.exports = function (grunt) {
236235
}
237236
}
238237
},
239-
// Run some tasks in parallel to speed up the build process
240-
concurrent: {
241-
default: [
242-
'build',
243-
'docs'
244-
]
245-
},
246238
compress: {
247239
tgz: {
248240
options: {
@@ -254,6 +246,7 @@ module.exports = function (grunt) {
254246
cwd: '',
255247
src: [
256248
'<%= project.dist %>/<%= pkg.name %>.js',
249+
'<%= project.dist %>/<%= pkg.name %>.js.map',
257250
'<%= project.dist %>/<%= pkg.name %>.min.js',
258251
'<%= project.dist %>/<%= pkg.name %>.min.js.map',
259252
'THIRD _PARTY_SOFTWARE_AND_LICENCES.md',
@@ -272,6 +265,7 @@ module.exports = function (grunt) {
272265
cwd: '',
273266
src: [
274267
'<%= project.dist %>/<%= pkg.name %>.js',
268+
'<%= project.dist %>/<%= pkg.name %>.js.map',
275269
'<%= project.dist %>/<%= pkg.name %>.min.js',
276270
'<%= project.dist %>/<%= pkg.name %>.min.js.map',
277271
'THIRD _PARTY_SOFTWARE_AND_LICENCES.md',
@@ -320,15 +314,30 @@ module.exports = function (grunt) {
320314
dest: '/'
321315
}]
322316
}
317+
},
318+
// Run some tasks in parallel to speed up the build process
319+
concurrent: {
320+
default: [
321+
'build',
322+
'docs',
323+
'samples'
324+
],
325+
release: [
326+
'compress:zip',
327+
'compress:tgz',
328+
'compress:samples_zip',
329+
'compress:samples_tgz'
330+
]
323331
}
324332
});
325333

326334
grunt.registerTask('default', [
327335
'clean:default',
328336
'jshint:default',
329-
'test-unit',
330-
'concurrent',
331-
'copy:readme'
337+
'test',
338+
'build',
339+
'copy:samples',
340+
'concurrent:release'
332341
]);
333342

334343
grunt.registerTask('test', [
@@ -345,21 +354,15 @@ module.exports = function (grunt) {
345354
'clean:tmp',
346355
'concat',
347356
'uglify',
348-
'concat:raw',
349357
'clean:tmp'
350358
]);
351359

352-
grunt.registerTask('release', [
353-
'compress'
354-
]);
355-
356360
grunt.registerTask('docs', [
357361
'clean:tmp',
358362
'copy:template',
359363
'copy:styles',
360364
'copy:conf',
361365
'yuidoc',
362-
'copy:samples',
363366
'clean:tmp'
364367
]);
365368

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
# MyScriptJS [![Build Status](https://travis-ci.org/MyScript/MyScriptJS.svg?branch=v0.0.4)](https://travis-ci.org/MyScript/MyScriptJS)
1+
# MyScriptJS
22

33
[MyScriptJS](http://myscript.github.io/MyScriptJS/) is a free and open-source JavaScript library providing an easy way to use [MyScript Cloud]( https://dev.myscript.com/dev-kits/cloud-development-kit/) handwriting recognition in your app.
44

5+
[![Build Status](https://travis-ci.org/MyScript/MyScriptJS.svg?branch=master)](https://travis-ci.org/MyScript/MyScriptJS)
6+
[![GitHub version](https://badge.fury.io/gh/MyScript%2FMyScriptJS.svg)](http://badge.fury.io/gh/MyScript%2FMyScriptJS)
7+
[![Bower version](https://badge.fury.io/bo/myscript.svg)](http://badge.fury.io/bo/myscript)
8+
[![npm version](https://badge.fury.io/js/myscript.svg)](http://badge.fury.io/js/myscript)
9+
510
[MyScriptJS](http://myscript.github.io/MyScriptJS/) speeds up the development of handwriting interfaces with JavaScript, by abstracting and providing default implementations for the common tasks that need to be managed:
611

712
* **Ink management**: Store strokes and benefit from a built-in undo/redo system.

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "myscript",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"main": "./dist/myscript.js",
55
"description": "MyScriptJS is a free and open-source JavaScript library providing the easiest way to use MyScript Cloud handwriting recognition in your web app",
66
"keywords": [
@@ -36,6 +36,6 @@
3636
},
3737
"dependencies": {
3838
"cryptojslib": "3.1.x",
39-
"q": "1.0.x"
39+
"q": "1.2.x"
4040
}
4141
}

dist/myscript.js

Lines changed: 18 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/myscript.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/myscript.min.js

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/myscript.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "myscript",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"main": "./dist/myscript.js",
55
"description": "MyScriptJS is a free and open-source JavaScript library providing the easiest way to use MyScript Cloud handwriting recognition in your web app",
66
"keywords": [

0 commit comments

Comments
 (0)