Skip to content

Commit

Permalink
Merge branch 'dev-master' of github.com:yui/yui3 into dev-master
Browse files Browse the repository at this point in the history
  • Loading branch information
jconniff committed Apr 1, 2013
2 parents 3649f76 + 6b0f860 commit 3798f3a
Show file tree
Hide file tree
Showing 612 changed files with 9,979 additions and 223,258 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build-npm/
release/
build_docs/
build_rollup_tmp*/
build_tmp*/
Expand Down
19 changes: 7 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
language: node_js
node_js:
- 0.8
- 0.9
branches:
only:
- master
- 3.x
- dev-master
- dev-3.x
- "0.8"
- "0.10"
before_install:
- ./src/common/travis/before.sh
install:
- ./src/common/travis/install.sh
- npm -g install grunt-cli
script:
- ./src/common/travis/test.sh
- grunt travis
git:
depth: 30
branches:
except:
- live-docs
57 changes: 57 additions & 0 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -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.

82 changes: 82 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -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']);

};
298 changes: 5 additions & 293 deletions build/align-plugin/align-plugin-coverage.js

Large diffs are not rendered by default.

930 changes: 5 additions & 925 deletions build/anim-base/anim-base-coverage.js

Large diffs are not rendered by default.

110 changes: 5 additions & 105 deletions build/anim-color/anim-color-coverage.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3798f3a

Please sign in to comment.