Permalink
Browse files

Merge branch 'dev-3.x' into tree-traverse

Conflicts:
	src/tree/HISTORY.md
  • Loading branch information...
2 parents 16bb70f + e5ad3ee commit c44d34db4018856aa168c6791e53b0bf9b0dc554 @rgrove rgrove committed Apr 4, 2013
Showing 489 changed files with 5,764 additions and 219,194 deletions.
View
@@ -1,4 +1,5 @@
build-npm/
+release/
build_docs/
build_rollup_tmp*/
build_tmp*/
View
@@ -1,19 +1,11 @@
language: node_js
node_js:
- "0.8"
- - "0.9"
- "0.10"
-branches:
- only:
- - master
- - 3.x
- - dev-master
- - dev-3.x
-before_install:
- - ./src/common/travis/before.sh
-install:
- - ./src/common/travis/install.sh
script:
- - ./src/common/travis/test.sh
+ - grunt travis
git:
depth: 30
+branches:
+ except:
+ - live-docs
View
@@ -0,0 +1,57 @@
+Grunt Building
+==============
+
+Our dev and release builds are handled by [Grunt](http://gruntjs.com/).
+
+Installation
+------------
+
+First you need to install the `grunt-cli` (`npm -g install grunt-cli`)
+
+After cloning you can simply do an NPM install.
+
+`npm install`
+
+This will install the tools needed locally and build the library and npm package.
+
+Shortcuts
+---------
+
+ * `grunt build` Runs a `yogi` build.
+ * `grunt npm` Runs the npm build.
+ * `grunt test` Runs a `yogi test` on the entire lib.
+ * `grunt test-cli` Runs only the CLI tests.
+ * `grunt travis` Runs a custom build/test just for Travis CI.
+ * `grunt release` Runs a release build (more below)
+ * `grunt`, `grunt help`, `grunt yui` Will display build help.
+
+Release Build
+-------------
+
+You can do a full YUI release build with `grunt release`.
+
+This command uses two CLI options (`--release-version` and `--release-build`).
+
+ * `--release-version` The version to stamp the files with
+ * `--release-build` The build number of this release.
+
+If `--release-build` is not provided, the last Git sha (short version) will be used in it's place.
+
+Release builds are stored under: `./releases/[VERSION]/`
+
+The release build consists of the following artifacts:
+
+ * `dist release zip` Containing source, tests, HISTORY, api docs and landing pages.
+ * `cdn release zip` Contains the build dir stamped for a CDN release (CSS files processed for relative paths)
+ * `ssl cdn release zip` Same as above only tweaked for SSL access.
+ * `npm package` The npm package designed for a simple `npm publish`
+
+Other Builds
+------------
+
+We no longer require a `Makefile` for any of our modules, they have all been converted to `grunt` builds.
+
+ * `cssnormalize` Under `src/cssnormalize`, `grunt` will import the source.
+ * `handlebars` Under `src/handlebars`, `grunt` will import the source.
+ * `test` Under `src/test`, `grunt` will import the source.
+
View
@@ -0,0 +1,82 @@
+module.exports = function(grunt) {
+
+ var cli = grunt.cli;
+
+ cli.optlist['release-version'] = {
+ info: 'Release Version',
+ type: String
+ };
+
+ cli.optlist['release-build'] = {
+ info: 'Release Build',
+ type: String
+ };
+
+ cli.optlist['cache-build'] = {
+ info: 'Cache the build',
+ type: Boolean
+ };
+
+ grunt.config.init({
+ version: grunt.option('release-version'),
+ build: grunt.option('release-build'),
+ buildtag: 'YUI <%= version %> (build <%= build %>)',
+ copyright: 'Copyright <%= grunt.template.today("yyyy") %> Yahoo! Inc. All rights reserved.',
+ license: 'Licensed under the BSD License.\nhttp://yuilibrary.com/license/',
+ compress: {
+ dist: {
+ files: [
+ {
+ expand: true,
+ cwd: 'release/<%= version %>/dist/',
+ src: ['**'],
+ dest: 'yui/'
+ }
+ ],
+ options: {
+ pretty: true,
+ archive: 'release/<%= version %>/archives/yui_<%= version %>.zip',
+ mode: 'zip',
+ level: 3
+ }
+ },
+ cdn: {
+ files: [
+ {
+ expand: true,
+ cwd: 'release/<%= version %>/cdn/',
+ dest: '<%= version %>/',
+ src: ['**']
+ }
+ ],
+ options: {
+ pretty: true,
+ archive: 'release/<%= version %>/archives/akamai_<%= version %>.zip',
+ mode: 'zip',
+ level: 3
+ }
+ },
+ 'cdn-ssl': {
+ files: [
+ {
+ expand: true,
+ cwd: 'release/<%= version %>/cdn-ssl/',
+ dest: '<%= version %>/',
+ src: ['**']
+ }
+ ],
+ options: {
+ pretty: true,
+ archive: 'release/<%= version %>/archives/akamaissl_<%= version %>.zip',
+ mode: 'zip',
+ level: 3
+ }
+ }
+ }
+ });
+
+ grunt.loadNpmTasks('grunt-yui-contrib');
+ grunt.loadNpmTasks('grunt-contrib-compress');
+ grunt.registerTask('default', ['boot']);
+
+};
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c44d34d

Please sign in to comment.