Browse Source

Some fixes in the build script and tests

css_transitions
josdejong 10 years ago
parent
commit
421e338b30
6 changed files with 17 additions and 17 deletions
  1. +10
    -7
      Jakefile.js
  2. +2
    -6
      README.md
  3. +2
    -1
      package.json
  4. +1
    -1
      test/dataset.js
  5. +1
    -1
      test/dataview.js
  6. +1
    -1
      test/eventbus.js

+ 10
- 7
Jakefile.js View File

@ -9,16 +9,17 @@ var jake = require('jake'),
require('jake-utils'); require('jake-utils');
// constants // constants
var VIS = './dist/vis.js';
var VIS_CSS = './dist/vis.css';
var VIS_TMP = './vis.js.tmp';
var VIS_MIN = './dist/vis.min.js';
var DIST = './dist';
var VIS = DIST + '/vis.js';
var VIS_CSS = DIST + '/vis.css';
var VIS_TMP = DIST + '/vis.js.tmp';
var VIS_MIN = DIST + '/vis.min.js';
/** /**
* default task * default task
*/ */
desc('Execute all tasks: build all libraries');
task('default', ['build', 'minify', 'test'], function () {
desc('Default task: build all libraries');
task('default', ['build', 'minify'], function () {
console.log('done'); console.log('done');
}); });
@ -27,6 +28,8 @@ task('default', ['build', 'minify', 'test'], function () {
*/ */
desc('Build the visualization library vis.js'); desc('Build the visualization library vis.js');
task('build', {async: true}, function () { task('build', {async: true}, function () {
jake.mkdirP(DIST);
// concatenate and stringify the css files // concatenate and stringify the css files
concat({ concat({
src: [ src: [
@ -137,7 +140,7 @@ task('minify', function () {
* test task * test task
*/ */
desc('Test the library'); desc('Test the library');
task('test', ['build'], function () {
task('test', function () {
// TODO: use a testing suite for testing: nodeunit, mocha, tap, ... // TODO: use a testing suite for testing: nodeunit, mocha, tap, ...
var filelist = new jake.FileList(); var filelist = new jake.FileList();
filelist.include([ filelist.include([

+ 2
- 6
README.md View File

@ -134,13 +134,9 @@ root of the project.
cd vis cd vis
npm install npm install
To be able to run jake from the command line, jake must be installed globally:
Then, the project can be build running:
sudo npm install -g jake
Then, the project can be build by executing jake in the root of the project:
jake
npm run build
## License ## License

+ 2
- 1
package.json View File

@ -21,7 +21,8 @@
"browser" "browser"
], ],
"scripts": { "scripts": {
"test": "jake test --trace"
"test": "jake test --trace",
"build": "jake --trace"
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {

+ 1
- 1
test/dataset.js View File

@ -1,6 +1,6 @@
var assert = require('assert'), var assert = require('assert'),
moment = require('moment'), moment = require('moment'),
vis = require('../vis.js'),
vis = require('../dist/vis.js'),
DataSet = vis.DataSet; DataSet = vis.DataSet;
var now = new Date(); var now = new Date();

+ 1
- 1
test/dataview.js View File

@ -1,6 +1,6 @@
var assert = require('assert'), var assert = require('assert'),
moment = require('moment'), moment = require('moment'),
vis = require('../vis.js'),
vis = require('../dist/vis.js'),
DataSet = vis.DataSet, DataSet = vis.DataSet,
DataView = vis.DataView; DataView = vis.DataView;

+ 1
- 1
test/eventbus.js View File

@ -1,7 +1,7 @@
// test vis.EventBus // test vis.EventBus
var assert = require('assert'), var assert = require('assert'),
vis = require('../vis');
vis = require('../dist/vis');
var bus = new vis.EventBus(); var bus = new vis.EventBus();

Loading…
Cancel
Save