DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

build: Removed redundant loadNpmTasks ; Use config.delimiter instead of concat in java tasks ; Moved cTest variables to config ;

Browse Source
This commit is contained in:
Pierre Renaux
2015-08-13 17:43:42 +08:00
parent c174b92f62
commit b07454a14d
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Gruntfile.js
View File

@@ -6,10 +6,10 @@ module.exports = function(grunt) {
var isWindows = /^win/.test(process.platform); var isWindows = /^win/.test(process.platform);
require('load-grunt-tasks')(grunt); require('load-grunt-tasks')(grunt);
grunt.loadNpmTasks('grunt-contrib-concat');
// config // config
var config = { var config = {
delimiter: path.delimiter,
libName: 'css-layout', libName: 'css-layout',
distFolder: 'dist', distFolder: 'dist',
srcFolder: 'src', srcFolder: 'src',
@@ -25,20 +25,19 @@ module.exports = function(grunt) {
} }
// C compilation configuration // C compilation configuration
var cTestClean, cTestCompile, cTestExecute;
if (isWindows) { if (isWindows) {
// Windows build, assumes cl is in the path (see https://msdn.microsoft.com/en-us/library/f2ccy3wt.aspx). // Windows build, assumes cl is in the path (see https://msdn.microsoft.com/en-us/library/f2ccy3wt.aspx).
config.cTestOutput = 'c_test.exe'; config.cTestOutput = 'c_test.exe';
cTestCompile = 'cl -nologo -Zi -Tpsrc/__tests__/Layout-test.c -Tpsrc/Layout.c -Tpsrc/Layout-test-utils.c -link -incremental:no -out:"<%= config.cTestOutput %>"'; config.cTestCompile = 'cl -nologo -Zi -Tpsrc/__tests__/Layout-test.c -Tpsrc/Layout.c -Tpsrc/Layout-test-utils.c -link -incremental:no -out:"<%= config.cTestOutput %>"';
cTestExecute = '<%= config.cTestOutput %>'; config.cTestExecute = '<%= config.cTestOutput %>';
cTestClean = ['<%= config.cTestOutput %>','*.obj','*.pdb']; config.cTestClean = ['<%= config.cTestOutput %>','*.obj','*.pdb'];
} }
else { else {
// GCC build (OSX, Linux, ...), assumes gcc is in the path. // GCC build (OSX, Linux, ...), assumes gcc is in the path.
config.cTestOutput = 'c_test'; config.cTestOutput = 'c_test';
cTestCompile = 'gcc -std=c99 -Werror -Wno-padded src/__tests__/Layout-test.c src/Layout.c src/Layout-test-utils.c -lm -o "./<%= config.cTestOutput %>"'; config.cTestCompile = 'gcc -std=c99 -Werror -Wno-padded src/__tests__/Layout-test.c src/Layout.c src/Layout-test-utils.c -lm -o "./<%= config.cTestOutput %>"';
cTestExecute = './<%= config.cTestOutput %>'; config.cTestExecute = './<%= config.cTestOutput %>';
cTestClean = ['<%= config.cTestOutput %>']; config.cTestClean = ['<%= config.cTestOutput %>'];
} }
grunt.initConfig({ grunt.initConfig({
@@ -47,7 +46,7 @@ module.exports = function(grunt) {
clean: { clean: {
dist: ['<%= config.distFolder %>'], dist: ['<%= config.distFolder %>'],
cTest: cTestClean, cTest: config.cTestClean,
javaTest: ['**/*.class'] javaTest: ['**/*.class']
}, },
@@ -134,25 +133,16 @@ module.exports = function(grunt) {
shell: { shell: {
cCompile: { cCompile: {
command: cTestCompile command: config.cTestCompile
}, },
cTestExecute: { cTestExecute: {
command: cTestExecute command: config.cTestExecute
}, },
javaCompile: { javaCompile: {
command: 'javac -cp <%= config.javaLibFolder %>/junit4.jar' + command: 'javac -cp <%= config.javaLibFolder %>/junit4.jar<%= config.delimiter %><%= config.javaLibFolder %>/jsr305.jar<%= config.delimiter %><%= config.javaLibFolder %>/infer-annotations-1.4.jar' + ' -sourcepath ./src/java/src<%= config.delimiter %>./src/java/tests' + ' <%= config.javaSource %>'
path.delimiter + '<%= config.javaLibFolder %>/jsr305.jar' +
path.delimiter + '<%= config.javaLibFolder %>/infer-annotations-1.4.jar' +
' -sourcepath ./src/java/src' +
path.delimiter + './src/java/tests' +
' <%= config.javaSource %>'
}, },
javaTestExecute: { javaTestExecute: {
command: 'java -cp ./src/java/src' + command: 'java -cp ./src/java/src<%= config.delimiter %>./src/java/tests<%= config.delimiter %><%= config.javaLibFolder %>/junit4.jar<%= config.delimiter %><%= config.javaLibFolder %>/infer-annotations-1.4.jar <%= config.javaTestFiles %>'
path.delimiter + './src/java/tests' +
path.delimiter + '<%= config.javaLibFolder %>/junit4.jar' +
path.delimiter + '<%= config.javaLibFolder %>/infer-annotations-1.4.jar' +
' <%= config.javaTestFiles %>'
}, },
javaPackage: { javaPackage: {
command: 'jar cf <%= config.distFolder %>/<%= config.libName %>.jar <%= config.javaSource %>' command: 'jar cf <%= config.distFolder %>/<%= config.libName %>.jar <%= config.javaSource %>'