Skip to content

Commit

Permalink
Merge pull request #500 from XhmikosR/master
Browse files Browse the repository at this point in the history 
Re-organize dist folders
  • Loading branch information
@XhmikosR
XhmikosR committed Jan 7, 2016
2 parents c45c7e4 + e816f4f commit 94c6db9
Show file tree
Hide file tree
Showing 27 changed files with 3,968 additions and 4,341 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
View file
@@ -1,2 +1,3 @@
# Auto detect text files and perform LF normalization
* text=auto
* text eol=lf
*.jar binary
2 changes: 0 additions & 2 deletions .gitignore
View file
@@ -1,7 +1,5 @@
/build/
/node_modules/
/npm-debug.log
/release/npm/README.md
csslint.pnproj

# Diff files
Expand Down
6 changes: 3 additions & 3 deletions .jshintrc
View file
Expand Up @@ -2,6 +2,7 @@
"camelcase": true,
"curly": true,
"eqeqeq": true,
"es3": true,
"forin": true,
"immed": true,
"indent": 4,
Expand All @@ -15,7 +16,6 @@
"undef": true,
"unused": true,
"globals": {
"CSSLint": true,
"YUITest": true
"CSSLint": true
}
}
}
105 changes: 50 additions & 55 deletions Gruntfile.js
View file
Expand Up @@ -4,18 +4,15 @@

module.exports = function(grunt) {

// Force use of Unix newlines
grunt.util.linefeed = "\n";

// Project configuration.
grunt.initConfig({
// Metadata.
pkg: grunt.file.readJSON("package.json"),
banner: {
compact: "/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - " +
"<%= grunt.template.today('yyyy-mm-dd') %>\n" +
"<%= pkg.homepage ? '* ' + pkg.homepage + '\\n' : '' %>" +
"* Copyright (c) <%= grunt.template.today('yyyy') %> Nicole Sullivan and Nicholas C. Zakas;\n" +
"* Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> <%= _.pluck(pkg.licenses, 'url').join(', ') %> */\n",
full: "/*!\n" +
"CSSLint\n" +
banner: "/*!\n" +
"CSSLint v<%= pkg.version %>\n" +
"Copyright (c) <%= grunt.template.today('yyyy') %> Nicole Sullivan and Nicholas C. Zakas. All rights reserved.\n" +
"\n" +
"Permission is hereby granted, free of charge, to any person obtaining a copy\n" +
Expand All @@ -35,10 +32,8 @@ module.exports = function(grunt) {
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n" +
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n" +
"THE SOFTWARE.\n\n" +
"*/\n" +
"/* Build: v<%= pkg.version %> <%= grunt.template.today('dd-mmmm-yyyy hh:MM:ss') %> */"
},
build_dir: "build",
"*/\n",
build_dir: "dist",
//Parser lib copy for versions that can't use requirejs
parserlib: "node_modules/parserlib/lib/node-parserlib.js",
//clone copy for versions that can't use requirejs
Expand All @@ -56,101 +51,91 @@ module.exports = function(grunt) {
"<%= clone %>",
"<%= csslint_files %>"
],

// Task configuration.
clean: {
build: ["<%= build_dir %>"],
release: ["release"]
dist: "<%= build_dir %>"
},

changelog: {
dest: "CHANGELOG"
},

concat: {
core: {
options: {
banner: "<%= banner.full %>\n" +
//Hack for using the node version of parserlib
"var exports = exports || {};\n" +
banner: "<%= banner %>\n" +
// Hack for using the node version of parserlib and clone
"var module = module || {},\n" +
" exports = exports || {};\n\n" +
"var CSSLint = (function(){\n",
footer: "\nreturn CSSLint;\n})();"
},
src: [
"<%= core_files %>"
],
dest: "<%= build_dir %>/<%= pkg.name %>.js"
dest: "<%= build_dir %>/csslint.js"
},//Build environment workers
rhino: {
src: [
"<%= concat.core.dest %>",
"src/cli/common.js",
"src/cli/rhino.js"
],
dest: "<%= build_dir %>/<%= pkg.name %>-rhino.js"
dest: "<%= build_dir %>/csslint-rhino.js"
},
node: {
options: {
banner: "<%= banner.full %>\n" +
banner: "<%= banner %>" +
"var clone = require('clone');\n" +
"var parserlib = require('parserlib');\n",
footer: "\nexports.CSSLint = CSSLint;"
},
files: {
"<%= build_dir %>/<%= pkg.name %>-node.js": ["<%= csslint_files %>"],
"<%= build_dir %>/npm/lib/<%= pkg.name %>-node.js": ["<%= csslint_files %>"]
"<%= build_dir %>/csslint-node.js": ["<%= csslint_files %>"]
}
},
node_cli: {
options: {
banner: "#!/usr/bin/env node\n<%= banner.full %>"
banner: "#!/usr/bin/env node\n<%= banner %>"
},
src: [
"src/cli/common.js",
"src/cli/node.js"
],
dest: "<%= build_dir %>/npm/cli.js"
dest: "<%= build_dir %>/cli.js"
},
tests: {
src: [
"tests/**/*.js",
"!tests/all-rules.js"
],
dest: "<%= build_dir %>/<%= pkg.name %>-tests.js"
dest: "<%= build_dir %>/csslint-tests.js"
},
worker: {
options: {
banner: "<%= banner.full %>\n" +
banner: "<%= banner %>" +
//Hack for using the node version of parserlib
"var exports = exports || {};\n"
},
src: [
"<%= core_files %>",
"src/worker/*.js"
],
dest: "<%= build_dir %>/<%= pkg.name %>-worker.js"
dest: "<%= build_dir %>/csslint-worker.js"
},
wsh: {
src: [
"<%= concat.core.dest %>",
"src/cli/common.js",
"src/cli/wsh.js"
],
dest: "<%= build_dir %>/<%= pkg.name %>-wsh.js"
}
},
copy: {
build: {
expand: true,
cwd: "<%= build_dir %>/",
src: "**/*",
dest: "release/"
},
npm: {
expand: true,
src: ["README.md", "package.json"],
dest: "release/npm/"
dest: "<%= build_dir %>/csslint-wsh.js"
}
},

includereplace: {
release: {
dist: {
options: {
// Global variables available in all files
globals: {
Expand All @@ -163,48 +148,55 @@ module.exports = function(grunt) {
expand: true,
cwd: "<%= build_dir %>/",
src: "**/*",
dest: "release/"
dest: "<%= build_dir %>/"
}]
}
},

jshint: {
options: {
jshintrc: ".jshintrc"
},
gruntfile: {
src: ["Gruntfile.js", "tasks/*.js"]
},
core: {
src: "src/**/*.js"
},
demo: {
src: "demos/*.js"
},
all: {
src: "src/**/*.js"
},
tests: {
options: {
jshintrc: "tests/.jshintrc"
},
src: "tests/**/*.js"
}
},

watch: {
gruntfile: {
files: "<%= jshint.gruntfile.src %>",
tasks: ["jshint"]
tasks: "jshint"
},
src: {
files: "<%= jshint.all.src %>",
tasks: ["jshint:all"]
tasks: "jshint:core"
},
lib_test: {
files: "<%= jshint.tests.src %>",
tasks: ["jshint:tests"]
tasks: "jshint:tests"
}
},

yuitest: {
tests: {
src: [
"tests/**/*.js"
]
}
},

test_rhino: {
tests: {
src: [
Expand All @@ -223,14 +215,17 @@ module.exports = function(grunt) {
grunt.loadTasks("tasks");

// Default task.
grunt.registerTask("default", ["test"]);
grunt.registerTask("default", ["build", "test"]);

grunt.registerTask("build", ["clean", "concat", "includereplace"]);

// Alias for
grunt.registerTask("lint", ["jshint"]);
//Alias for
grunt.registerTask("dist", "build");
grunt.registerTask("lint", "jshint");

// Testing
grunt.registerTask("test", ["clean:build", "jshint", "concat", "yuitest"]);
grunt.registerTask("rhino", ["clean:build", "jshint", "concat", "test_rhino"]);
grunt.registerTask("test", ["build", "jshint", "yuitest"]);
grunt.registerTask("rhino", ["build", "jshint", "test_rhino"]);

grunt.registerTask("release", ["test", "clean:release", "copy", "includereplace:release", "changelog"]);
grunt.registerTask("release", ["default", "changelog"]);
};
2 changes: 1 addition & 1 deletion demos/CSSLintDemo.htm
View file
Expand Up @@ -8,7 +8,7 @@
.error { color: #D9534F; font-weight: bold; }
.warning { color: #F0AD4E; }
</style>
<script src="../build/csslint.js"></script>
<script src="../dist/csslint.js"></script>
<script src="demo.js"></script>
</head>
<body>
Expand Down

0 comments on commit 94c6db9

Please sign in to comment.