Skip to content
This repository was archived by the owner on Nov 7, 2023. It is now read-only.

Commit aeea9f8

Browse files
jbeezleyjbeezley
committed
Merge pull request #80 from OpenGeoscience/npm-bower
Prepare vgl for release on npm and bower
2 parents 283eed5 + fef23bf commit aeea9f8

10 files changed

+12547
-33
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/_build/*
22
.*.swp
33
/node_modules/*
4+
/dist

‎.jscsrc

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
{
22
"preset": "crockford",
33
"requireMultipleVarDecl": null,
4+
"requireVarDeclFirst": null,
45
"disallowQuotedKeysInObjects": null,
56
"validateQuoteMarks": true,
67
"validateIndentation": 2,
78
"requireCamelCaseOrUpperCaseIdentifiers": null,
89
"disallowDanglingUnderscores": null,
9-
"requireBlocksOnNewline": null,
10-
"excludeFiles": [
11-
"src/vgl/**",
12-
"src/util/wigglemaps.js",
13-
"src/util/pnltri.js"
14-
]
10+
"requireBlocksOnNewline": null
1511
}

‎.jshintrc

-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
"eqeqeq": true,
55
"forin": true,
66
"indent": 2,
7-
"freeze": true,
87
"latedef": true,
98
"newcap": true,
109
"noarg": true,
1110
"noempty": false,
12-
"nonbsp": true,
1311
"nonew": true,
1412
"plusplus": true,
1513
"quotmark": true,

‎.travis.yml

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
language: node_js
22

33
node_js:
4-
- "0.10"
4+
- "0.12"
55

66
before_install:
7-
- pushd "${HOME}"
8-
- curl "http://www.cmake.org/files/v3.2/cmake-3.2.1-Linux-x86_64.tar.gz" | gunzip -c | tar x
9-
- cd cmake-*/bin && export PATH="${PWD}:${PATH}"
10-
- popd
11-
- cmake --version
127
- env
138

149
script:
1510
- npm install
16-
- mkdir _build
17-
- cd _build
18-
- cmake ..
19-
- ctest -VV -S ../cmake/travis_build.cmake || true
20-
# - ctest -VV -S ../cmake/travis_submit.cmake
21-
- if [ -f test_failed ] ; then false ; fi
11+
- npm test
2212

2313
sudo: False

‎Gruntfile.js

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/* jshint node: true */
2+
module.exports = function (grunt) {
3+
'use strict';
4+
var sources = grunt.file.readJSON('sources.json'),
5+
src = sources.vgl.prefix,
6+
files = sources.vgl.files
7+
.map(function (f) {
8+
return src + '/' + f;
9+
});
10+
11+
grunt.initConfig({
12+
jshint: {
13+
library: {
14+
src: files,
15+
options: {
16+
jshintrc: '.jshintrc'
17+
}
18+
},
19+
gruntfile: {
20+
src: ['Gruntfile.js'],
21+
options: {
22+
node: true
23+
}
24+
}
25+
},
26+
jscs: {
27+
library: {
28+
src: files
29+
},
30+
gruntfile: {
31+
src: ['Gruntfile.js']
32+
}
33+
},
34+
concat: {
35+
dist: {
36+
src: files,
37+
dest: 'dist/vgl.js'
38+
}
39+
},
40+
uglify: {
41+
dist: {
42+
files: {
43+
'dist/vgl.min.js': files
44+
},
45+
options: {
46+
mangle: true,
47+
ASCIIOnly: true,
48+
sourceMap: true
49+
}
50+
}
51+
}
52+
});
53+
54+
grunt.loadNpmTasks('grunt-contrib-jshint');
55+
grunt.loadNpmTasks('grunt-jscs');
56+
grunt.loadNpmTasks('grunt-contrib-concat');
57+
grunt.loadNpmTasks('grunt-contrib-uglify');
58+
59+
grunt.registerTask('test', ['jshint', 'jscs']);
60+
grunt.registerTask('default', ['concat', 'uglify']);
61+
};

‎bower.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "vgl",
3+
"description": "VTK for the Web.",
4+
"main": "vgl.js",
5+
"license": "Apache-2.0",
6+
"homepage": "https://github.com/OpenGeoscience/vgl",
7+
"moduleType": [],
8+
"ignore": [
9+
"**/*",
10+
"!/vgl.js",
11+
"!/vgl.min.js",
12+
"!README.md"
13+
]
14+
}

‎package.json

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
{
22
"name": "vgl",
33
"description": "VTK for the Web.",
4-
"version": "0.1.14",
4+
"version": "0.2.0",
55
"repository": {
66
"type": "git",
77
"url": "git://github.com/OpenGeoscience/vgl.git"
88
},
9-
"devDependencies": {
9+
"dependencies": {
1010
"grunt": "~0.4",
11-
"grunt-contrib-jshint": "~0.1.1",
12-
"grunt-contrib-uglify": "~0.2.4",
13-
"grunt-contrib-watch": "~0.6",
14-
"grunt-contrib-concat": "~0.3.0",
15-
"grunt-contrib-copy": "~0.4.0",
16-
"grunt-contrib-clean": "~0.5.0",
17-
"grunt-shell": ">=0.2.1",
18-
"grunt-release": "~0.6.0",
19-
"jscs": "1.11.2",
20-
"jsdoc": "^3.3",
21-
"jshint": "~2.5"
11+
"grunt-cli": "^0.1.13",
12+
"grunt-contrib-concat": "^0.5.1",
13+
"grunt-contrib-uglify": "^0.10.0"
14+
},
15+
"devDependencies": {
16+
"grunt-contrib-jshint": "^0.11.3",
17+
"grunt-jscs": "^2.2.0",
18+
"jscs": "^2.4.0",
19+
"jshint": "^2.8.0"
20+
},
21+
"scripts": {
22+
"install": "grunt",
23+
"test": "grunt test"
2224
}
2325
}

‎sources.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"vgl": {
3+
"prefix": "src",
4+
"files": [
5+
"init.js",
6+
"GL.js",
7+
"timestamp.js",
8+
"object.js",
9+
"event.js",
10+
"boundingObject.js",
11+
"node.js",
12+
"groupNode.js",
13+
"actor.js",
14+
"freezeObject.js",
15+
"defaultValue.js",
16+
"graphicsObject.js",
17+
"geojsonReader.js",
18+
"data.js",
19+
"geomData.js",
20+
"mapper.js",
21+
"groupMapper.js",
22+
"materialAttribute.js",
23+
"blend.js",
24+
"material.js",
25+
"renderer.js",
26+
"renderWindow.js",
27+
"camera.js",
28+
"interactorStyle.js",
29+
"trackballInteractorStyle.js",
30+
"pvwInteractorStyle.js",
31+
"viewer.js",
32+
"shader.js",
33+
"shaderProgram.js",
34+
"texture.js",
35+
"uniform.js",
36+
"vertexAttribute.js",
37+
"source.js",
38+
"planeSource.js",
39+
"pointSource.js",
40+
"lineSource.js",
41+
"utils.js",
42+
"picker.js",
43+
"shapefileReader.js",
44+
"vtkReader.js",
45+
"dataBuffers.js"
46+
]
47+
}
48+
}

0 commit comments

Comments
 (0)