Skip to content

Commit

Permalink
Merge pull request #2741 from timwienk/gruntfile-restructuring
Browse files Browse the repository at this point in the history
Gruntfile: Restructuring.
  • Loading branch information
Arian Stolwijk committed Oct 5, 2015
2 parents 629fe90 + 0914d68 commit b3b3b96
Show file tree
Hide file tree
Showing 20 changed files with 542 additions and 503 deletions.
12 changes: 4 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/build/
/dist/
/node_modules/
/*.log
mootools-core.tmproj
mootools-core.esproj
mootools-core-mobile.js
.DS_Store
*~
node_modules
mootools-all.js
mootools-nocompat.js
mootools-specs.js
mootools-server.js
mootools-server-specs.js
sauce*.log
*.swp
54 changes: 28 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,33 @@ node_js:

env:
matrix:
- BROWSER='chrome_linux' BUILD='default'
- BROWSER='firefox_linux' BUILD='default'
- BROWSER='opera_win2000' BUILD='default'
- BROWSER='safari8' BUILD='default'
- BROWSER='safari7' BUILD='default'
- BROWSER='safari6' BUILD='default'
- BROWSER='ie11' BUILD='default'
- BROWSER='ie10' BUILD='default'
- BROWSER='ie9' BUILD='default'
- BROWSER='ie8' BUILD='default'
- BROWSER='ie7' BUILD='default'
- BROWSER='phantomjs' BUILD='default'

- BROWSER='chrome_linux' BUILD='nocompat'
- BROWSER='firefox_linux' BUILD='nocompat'
- BROWSER='opera_win2000' BUILD='nocompat'
- BROWSER='safari8' BUILD='nocompat'
- BROWSER='safari7' BUILD='nocompat'
- BROWSER='safari6' BUILD='nocompat'
- BROWSER='ie11' BUILD='nocompat'
- BROWSER='ie10' BUILD='nocompat'
- BROWSER='ie9' BUILD='nocompat'
- BROWSER='ie8' BUILD='nocompat'
- BROWSER='ie7' BUILD='nocompat'
- BROWSER='phantomjs' BUILD='nocompat'
- BUILD='compat' BROWSER='phantomjs'
- BUILD='compat' BROWSER='chrome'
- BUILD='compat' BROWSER='firefox'
- BUILD='compat' BROWSER='edge'
- BUILD='compat' BROWSER='opera12'
- BUILD='compat' BROWSER='safari8'
- BUILD='compat' BROWSER='safari7'
- BUILD='compat' BROWSER='safari6'
- BUILD='compat' BROWSER='ie11'
- BUILD='compat' BROWSER='ie10'
- BUILD='compat' BROWSER='ie9'
- BUILD='compat' BROWSER='ie8'
- BUILD='compat' BROWSER='ie7'

- BUILD='nocompat' BROWSER='phantomjs'
- BUILD='nocompat' BROWSER='chrome'
- BUILD='nocompat' BROWSER='firefox'
- BUILD='nocompat' BROWSER='edge'
- BUILD='nocompat' BROWSER='opera12'
- BUILD='nocompat' BROWSER='safari8'
- BUILD='nocompat' BROWSER='safari7'
- BUILD='nocompat' BROWSER='safari6'
- BUILD='nocompat' BROWSER='ie11'
- BUILD='nocompat' BROWSER='ie10'
- BUILD='nocompat' BROWSER='ie9'
- BUILD='nocompat' BROWSER='ie8'
- BUILD='nocompat' BROWSER='ie7'

- BUILD='server'

Expand All @@ -46,6 +48,6 @@ matrix:

cache:
directories:
- node_modules
- node_modules

sudo: false
104 changes: 104 additions & 0 deletions Grunt/options/browsers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"phantomjs": {
"base": "PhantomJS"
},
"chrome": {
"base": "SauceLabs",
"platform": "Linux",
"browserName": "chrome"
},
"firefox": {
"base": "SauceLabs",
"platform": "Linux",
"browserName": "firefox"
},
"edge": {
"base": "SauceLabs",
"platform": "Windows 10",
"browserName": "microsoftedge"
},
"opera12": {
"base": "SauceLabs",
"platform": "Windows 7",
"browserName": "opera",
"version": "12"
},
"safari8": {
"base": "SauceLabs",
"platform": "OS X 10.11",
"browserName": "safari",
"version": "8.1"
},
"safari7": {
"base": "SauceLabs",
"platform": "OS X 10.9",
"browserName": "safari",
"version": "7"
},
"safari6": {
"base": "SauceLabs",
"platform": "OS X 10.8",
"browserName": "safari",
"version": "6"
},
"safari5_osx": {
"base": "SauceLabs",
"platform": "OS X 10.6",
"browserName": "safari",
"version": "5"
},
"safari5_windows": {
"base": "SauceLabs",
"platform": "Windows 7",
"browserName": "safari",
"version": "5"
},
"ie11": {
"base": "SauceLabs",
"platform": "Windows 8.1",
"browserName": "internet explorer",
"version": "11"
},
"ie10": {
"base": "SauceLabs",
"platform": "Windows 8",
"browserName": "internet explorer",
"version": "10"
},
"ie9": {
"base": "SauceLabs",
"platform": "Windows 7",
"browserName": "internet explorer",
"version": "9"
},
"ie8": {
"base": "SauceLabs",
"platform": "Windows 7",
"browserName": "internet explorer",
"version": "8"
},
"ie7": {
"base": "SauceLabs",
"platform": "Windows XP",
"browserName": "internet explorer",
"version": "7"
},
"ie6": {
"base": "SauceLabs",
"platform": "Windows XP",
"browserName": "internet explorer",
"version": "6"
},
"android": {
"base": "SauceLabs",
"platform": "Linux",
"browserName": "android",
"deviceOrientation": "portrait"
},
"iphone": {
"base": "SauceLabs",
"platform": "OS X 10.10",
"browserName": "iphone",
"deviceOrientation": "portrait"
}
}
76 changes: 76 additions & 0 deletions Grunt/options/build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
'use strict';

module.exports = function(grunt){
var dir = grunt.config.get('environment.dir'),
build = grunt.config.get('environment.build'),
travis = grunt.config.get('environment.travis');

var config = {
clean: {
'build': {src: dir.build + '/mootools-*.js'}
},
karma: {
'run': {
options: {
files: [dir.build + '/mootools-core.js', dir.build + '/mootools-specs.js']
}
},
'dev': {
options: {
files: [dir.build + '/mootools-core.js', dir.build + '/mootools-specs.js']
},
singleRun: false,
captureTimeout: 0
},
'travis': {
options: {
files: [dir.build + '/mootools-core.js', dir.build + '/mootools-specs.js']
},
reporters: ['progress', 'saucelabs'],
browsers: [travis.browser]
}
},
mochaTest: {
'run': {
src: [dir.build + '/mootools-core.js', dir.build + '/mootools-specs.js']
},
'dev': {
options: {
watch: true
},
src: [dir.build + '/mootools-core.js', dir.build + '/mootools-specs.js']
},
'travis': {
src: [dir.build + '/mootools-core.js', dir.build + '/mootools-specs.js']
}
},
packager: {
'compat': {
options: {
strip: build.compat.strip,
only: build.compat.components
},
src: build.compat.sources,
dest: dir.build + '/mootools-core.js'
},
'nocompat': {
options: {
strip: build.nocompat.strip,
only: build.nocompat.components
},
src: build.nocompat.sources,
dest: dir.build + '/mootools-core.js'
},
'server': {
options: {
strip: build.server.strip,
only: build.server.components
},
src: build.server.sources,
dest: dir.build + '/mootools-core.js'
}
}
};

return config;
};
82 changes: 82 additions & 0 deletions Grunt/options/dist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
'use strict';

module.exports = function(grunt){
var dir = grunt.config.get('environment.dir'),
build = grunt.config.get('environment.build');

var config = {
clean: {
'dist': {src: dir.dist + '/mootools-*.js'},
'dist-compat': {src: [dir.dist + '/' + build.compat.name + '.js', dir.dist + '/' + build.compat.name + '.min.js']},
'dist-nocompat': {src: [dir.dist + '/' + build.nocompat.name + '.js', dir.dist + '/' + build.nocompat.name + '.min.js']},
'dist-server': {src: dir.dist + '/' + build.server.name + '.js'}
},
karma: {
'dist-compat': {
options: {
files: [dir.dist + '/' + build.compat.name + '.js', dir.build + '/mootools-specs.js']
}
},
'dist-compat-minified': {
options: {
files: [dir.dist + '/' + build.compat.name + '.min.js', dir.build + '/mootools-specs.js' ]
}
},
'dist-nocompat': {
options: {
files: [dir.dist + '/' + build.nocompat.name + '.js', dir.build + '/mootools-specs.js']
}
},
'dist-nocompat-minified': {
options: {
files: [dir.dist + '/' + build.nocompat.name + '.min.js', dir.build + '/mootools-specs.js']
}
}
},
mochaTest: {
'dist-server': {
src: [dir.dist + '/' + build.server.name + '.js', dir.build + '/mootools-specs.js']
}
},
packager: {
'dist-compat': {
options: {
strip: build.compat.strip,
only: build.compat.components
},
src: build.compat.sources,
dest: dir.dist + '/' + build.compat.name + '.js'
},
'dist-nocompat': {
options: {
strip: build.nocompat.strip,
only: build.nocompat.components
},
src: build.nocompat.sources,
dest: dir.dist + '/' + build.nocompat.name + '.js'
},
'dist-server': {
options: {
strip: build.server.strip,
only: build.server.components
},
src: build.server.sources,
dest: dir.dist + '/' + build.server.name + '.js'
}
},
uglify: {
'dist-compat': {
files: [
{src: dir.dist + '/' + build.compat.name + '.js', dest: dir.dist + '/' + build.compat.name + '.min.js'}
]
},
'dist-nocompat': {
files: [
{src: dir.dist + '/' + build.nocompat.name + '.js', dest: dir.dist + '/' + build.nocompat.name + '.min.js'}
]
}
}
};

return config;
};
Loading

0 comments on commit b3b3b96

Please sign in to comment.