scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-08-12 05:59:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build issues on Travis and improve version handling in Gulp.js and Prepro.js

Browse source 
This reverts commit eaceb1bfc3.
This commit is contained in:
Jürg Lehni 2016-01-18 09:56:02 +01:00
parent eaceb1bfc3
commit 503fe11e41
6 changed files with 69 additions and 45 deletions

40
gulpfile.js
View file

@ -21,14 +21,19 @@ var gulp = require('gulp'),
whitespace = require('gulp-whitespace'),
merge = require('merge-stream'),
del = require('del'),
zip = require('gulp-zip'),
extend = require('extend'),
fs = require('fs'),
gitty = require('gitty'),
fs = require('fs');
zip = require('gulp-zip');
/**
* Options
*/
// Require the __options object before preprocessing, so we have access to the
// version number and can make amendments, e.g. the release date.
var options = require('./src/options.js');
// Options to be used in Prepro.js preprocessing through the global __options
// object.
var buildOptions = {
@ -66,13 +71,12 @@ function git(param) {
return new gitty.Command(gitRepo, operation, args).execSync().trim();
}
var gitDate = git('log -1 --pretty=format:%ad');
var gitVersion = git('describe --abbrev=0 --tags');
var gitBranch = git('rev-parse --abbrev-ref HEAD');
if (gitBranch !== 'master')
gitVersion += '-' + gitBranch;
gulp.task('nop');
// Get the date of the last commit from this branch for release date:
options.date = git('log -1 --pretty=format:%ad');
// If we're not on the master branch, append the branch name to the version:
var branch = git('rev-parse --abbrev-ref HEAD');
if (branch !== 'master')
options.version += '-' + branch;
/**
* Task: default
@ -148,15 +152,17 @@ buildNames.forEach(function(name) {
gulp.task('build:' + name, ['build:start'], function() {
return gulp.src('src/paper.js')
.pipe(prepro({
evaluate: ['src/constants.js', 'src/options.js'],
// Evaluate constants.js inside the precompilation scope before
// the actual precompilation, so all the constants substitution
// statements in the code can work (look for: /*#=*/):
evaluate: ['src/constants.js'],
setup: function() {
var options = buildOptions[name];
options.version = gitVersion;
options.date = gitDate;
// This object will be merged into the Prepro.js VM scope,
// which already holds a __options object from the above
// include statement.
return { __options: options };
// Return objects to be defined in the preprocess-scope.
// Note that this would be merge in with already existing
// objects.
return {
__options: extend({}, options, buildOptions[name])
};
}
}))
.pipe(uncomment({