You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ko...@apache.org on 2014/08/29 15:12:30 UTC
git commit: [OLINGO-316] Add task dist
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 0db5bbf38 -> 3d06a1b02
[OLINGO-316] Add task dist
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/3d06a1b0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/3d06a1b0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/3d06a1b0
Branch: refs/heads/master
Commit: 3d06a1b02cb376fa69cc52819426c4fc1ab9db30
Parents: 0db5bbf
Author: Sven Kobler <sv...@sap.com>
Authored: Fri Aug 29 15:12:24 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Fri Aug 29 15:12:24 2014 +0200
----------------------------------------------------------------------
odatajs/Gruntfile.js | 105 ++++++----
odatajs/LICENSE | 202 +++++++++++++++++++
.../grunt-config/custom-tasks/rat/tasks/rat.js | 2 +-
odatajs/grunt-config/release.js | 108 ++++++++++
odatajs/package.json | 3 +-
5 files changed, 379 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3d06a1b0/odatajs/Gruntfile.js
----------------------------------------------------------------------
diff --git a/odatajs/Gruntfile.js b/odatajs/Gruntfile.js
index bc300e5..131ec43 100644
--- a/odatajs/Gruntfile.js
+++ b/odatajs/Gruntfile.js
@@ -1,59 +1,61 @@
module.exports = function(grunt) {
'use strict';
+/*
+ var x = grunt.file.isMatch( { dot : true} ,
+ '**node_modules/**',
+ ['node_modules/1']
+ );
+ console.log('X: '+ x);
+ process.exit(1);*/
+
var init = {
pkg: grunt.file.readJSON('package.json'),
banner: grunt.file.read('src/banner.txt'),
filename : '<%= pkg.name %>-<%= pkg.version %>-<%= pkg.postfix %>',
- browserify: {
- // start with index.js and follow all required source in order pack them together
- datajs: {
+
+ browserify: { // convert code from nodejs style to brower style
+ src: {
files: {
'build/<%= filename %>.js': ['src/index.js'],
},
- options: {
- transform: ['./grunt-config/browserify_transforms/stripheader/stripheader.js'],
- browserifyOptions: {
- } ,
- bundleOptions: {
- },
+ options: {
+ transform: ['./grunt-config/browserify_transforms/stripheader/stripheader.js'], // remove apache license headers before contatenating
+ browserifyOptions: { } ,
+ bundleOptions: { },
}
}
},
- uglify: {
+ uglify: { // uglify and minify the lib
options: {
sourceMap : true,
- sourceMapName : 'build/<%= filename %>.map',
- sourceMapIncludeSources :true,
+ sourceMapName : 'build/<%= filename %>.map',
+ sourceMapIncludeSources : true,
},
- // uglify and compress the packed sources
build: {
src: 'build/<%= filename %>.js',
dest: 'build/<%= filename %>.min.js'
}
},
- concat : {
+ concat : { // add the apache license headers
options : {
banner : '<%= banner %>'
},
+ licence: {
+ src: 'build/<%= filename %>.js',
+ dest: 'build/<%= filename %>.js',
+ },
licence_min: {
src: 'build/<%= filename %>.min.js',
dest: 'build/<%= filename %>.min.js',
},
- licence: {
- src: 'build/<%= filename %>.js',
- dest: 'build/<%= filename %>.js',
- }
},
- copy: {
+ copy: { // copy odatajs library files to demo folder withch contains samples
forDemo: {
- files: [
- // includes files within path
- {expand: true, cwd: 'build/', src: ['**'], dest: 'demo/scripts/', filter: 'isFile'},
- ]
+ files: [{ expand: true, cwd: 'build/', src: ['<%= filename %>*.*'], dest: 'demo/scripts/', filter: 'isFile'}]
}
},
- connect: {
+ connect: { // not used, start a testing server
demo: {
options: {
port: 4001 ,
@@ -121,7 +123,7 @@ module.exports = function(grunt) {
}
},
},
- jsdoc : {
+ 'jsdoc' : { // generate documentation
src : {
src: ['src/**/*.js'],
options: {
@@ -137,7 +139,7 @@ module.exports = function(grunt) {
}
}
},
- "npm-clean": {
+ 'npm-clean': {
tmp: {
src: [ "build/tmp"]
},
@@ -154,20 +156,37 @@ module.exports = function(grunt) {
}
},
},
- compress: {
- build: {
+ compress: { // build the zip files for the release
+ /*
+ build: { // just the lib
options: {archive: 'dist/<%= filename %>-lib.zip'},
- files: [{expand: true, cwd: 'build/', src: ['*'], filter: 'isFile', dest: '<%= filename %>-lib/'}]
- },
- doc: {
+ files: [{expand: true, cwd: 'build/', src: '*', filter: 'isFile', dest: '<%= filename %>-lib/'}]
+ },*/
+ doc: { // just the documentation
options: {archive: 'dist/<%= filename %>-doc.zip'},
files: [{expand: true, cwd: 'build/doc/', src: ['**'], dest: '<%= filename %>-doc/'}]
},
- src: {
+ src: { // just the source
options: {archive: 'dist/<%= filename %>-source.zip'},
files: [{expand: true, cwd: 'src/', src: ['**'], dest: '<%= filename %>-src/'}]
+ },
+ sources : { // the full repository with out the git stuff
+ options: {archive: 'dist/<%= filename %>-source.zip'},
+ files: [
+ {expand: true, cwd: 'demo/', src: ['**'], dest: '<%= filename %>-src/'},
+ {expand: true, cwd: 'src/', src: ['**'], dest: '<%= filename %>-src/'}
+ ]
+ }
+ },
+ curl: {
+ 'license': {
+ src: {
+ url: 'http://apache.org/licenses/LICENSE-2.0.txt',
+ proxy: 'http://proxy:8080'
+ },
+ dest: 'LICENSE'
}
- }
+ }
};
/*** Join local configuration for proxies and local test servers ***/
@@ -179,6 +198,13 @@ module.exports = function(grunt) {
/*** Init ***/
grunt.initConfig(init);
+ grunt.config.merge({compress: { // build the zip files for the release
+ build: { // just the lib
+ options: {archive: 'dist/<%= filename %>-lib.zip'},
+ files: [{expand: true, cwd: 'build/', src: '*', filter: 'isFile', dest: '<%= filename %>-lib/'}]
+ }}});
+
+
/*** Load tasks from npm modules ***/
grunt.loadNpmTasks('grunt-browserify');
@@ -188,24 +214,24 @@ module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-contrib-copy");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks('grunt-contrib-compress');
+ grunt.loadNpmTasks('grunt-curl');
grunt.loadNpmTasks("grunt-jsdoc");
-
// Start Qunit tests direcly in node js, internally qunit (npm qunit)
// is used, no phantomjs instance required
grunt.loadNpmTasks('grunt-node-qunit');
- grunt.loadNpmTasks('grunt-contrib-clean');
+ //grunt.loadNpmTasks('grunt-contrib-clean');
// Load the custom-* tasks from the grunt-config directory
grunt.loadTasks('grunt-config');
// rename some tasks to avoid name clashes with the user tasks
- grunt.renameTask('clean','npm-clean');
+ //grunt.renameTask('clean','npm-clean');
/*** E N D U S E R T A S K S ***/
- grunt.registerTask('clean', ['npm-clean:doc','npm-clean:tmp']);
+ //grunt.registerTask('clean', ['npm-clean:doc','npm-clean:tmp']);
// Runs the license header check to verify the any source file contains a license header
grunt.registerTask('license-check', ['custom-license-check']);
@@ -215,12 +241,13 @@ module.exports = function(grunt) {
grunt.registerTask('doc-test', [/*'npm-clean:doc-test',*/'jsdoc:test']);
// Build the odatajs library
- grunt.registerTask('build', ['browserify:datajs', 'uglify:build', 'concat','copy:forDemo']);
+ grunt.registerTask('build', ['browserify:src', 'uglify:build', 'concat','copy:forDemo']);
grunt.registerTask('test-browser', ['configureProxies:test-browser', 'connect:test-browser']);
grunt.registerTask('test-node', ['node-qunit:default-tests']);
- grunt.registerTask('release', ['build','doc','compress']);
+ //grunt.registerTask('release', ['build','doc','compress']);
+ grunt.registerTask('update-legal', ['curl:license']);
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3d06a1b0/odatajs/LICENSE
----------------------------------------------------------------------
diff --git a/odatajs/LICENSE b/odatajs/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/odatajs/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3d06a1b0/odatajs/grunt-config/custom-tasks/rat/tasks/rat.js
----------------------------------------------------------------------
diff --git a/odatajs/grunt-config/custom-tasks/rat/tasks/rat.js b/odatajs/grunt-config/custom-tasks/rat/tasks/rat.js
index 8c6e8b0..0b46258 100644
--- a/odatajs/grunt-config/custom-tasks/rat/tasks/rat.js
+++ b/odatajs/grunt-config/custom-tasks/rat/tasks/rat.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
var dir = this.data.dir;
var out = options.tmpDir + '/' + (options.xml ? 'rat.xml' : 'rat.txt');
- var pathToRat = path.resolve(__dirname,'./../tools/apache-rat-0.10/apache-rat-0.10.jar');
+ var pathToRat = path.resolve(__dirname,'./../extern_modules/apache-rat-0.10/apache-rat-0.10.jar');
//sample command java -jar apache-rat-0.10.jar -x -d ./src > ./build/tmp/rat.txt
var cmd = 'java -jar ' + pathToRat+ ' ';
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3d06a1b0/odatajs/grunt-config/release.js
----------------------------------------------------------------------
diff --git a/odatajs/grunt-config/release.js b/odatajs/grunt-config/release.js
new file mode 100644
index 0000000..c9e80d9
--- /dev/null
+++ b/odatajs/grunt-config/release.js
@@ -0,0 +1,108 @@
+module.exports = function(grunt) {
+
+ function endsWith(hay, needle) {
+ return hay.indexOf(needle, hay.length - needle.length) !== -1;
+ }
+
+ function startsWith(hay, needle) {
+ return hay.indexOf(needle) === 0;
+ }
+
+ function contains(hay, needle) {
+ return hay.indexOf(needle) > -1;
+ }
+
+ // copy
+ grunt.config.merge( {
+ 'copy' : {
+ 'release-lib' : {
+ files: [
+ { expand: true, cwd: 'build', src: ['<%= filename %>*.*'], dest: './../dist/<%= filename %>/lib/lib', filter: 'isFile'},
+ { expand: true, src :'LICENSE',dest: './../dist/<%= filename %>/lib', filter: 'isFile' }
+ ]
+ },
+ 'release-doc' : {
+ files: [
+ { expand: true, cwd: 'build/doc', src: ['**'], dest: './../dist/<%= filename %>/doc/doc', filter: 'isFile'},
+ { expand: true, src :'LICENSE',dest: './../dist/<%= filename %>/doc', filter: 'isFile' }
+ ]
+ },
+ 'release-sources' : {
+ files: [
+ { dot: true, expand: true, cwd: '', src: ['**'], dest: './../dist/<%= filename %>/sources',
+ filter: function(srcPath) {
+ //no node_modules
+ if (srcPath === 'node_modules' || contains(srcPath, 'node_modules\\')) {
+ return false;
+ }
+ if (srcPath === 'extern_modules' || contains(srcPath, 'extern_modules\\')) {
+ return false;
+ }
+
+ if (srcPath === 'build' || startsWith(srcPath, 'build\\')) {
+ return false;
+ }
+
+ if (endsWith(srcPath, '.gitignore')) {
+ return false;
+ }
+ if (endsWith(srcPath, 'localgrunt.config')) {
+ return false;
+ }
+
+ console.log(' + ' + srcPath);
+ return true;
+ }},
+ ]
+ },
+ }
+ });
+
+ grunt.loadNpmTasks("grunt-contrib-copy");
+
+
+ // clean
+ grunt.config.merge( {
+ 'clean': {
+ 'release-dist': {
+ options: { force: true },
+ src: [ "./../dist/<%= filename %>"]
+ }
+ }
+ });
+
+ grunt.loadNpmTasks("grunt-contrib-clean");
+
+ // zip
+ grunt.config.merge( {
+ compress: { // build the zip files for the release
+ 'release-lib': { // just the lib
+ options: {archive: './../dist/<%= filename %>-lib.zip'},
+ files: [{expand: true, cwd: './../dist/<%= filename %>/lib', src: ['**'], dest: '/'}]
+ },
+ 'release-doc': { // just the documentation
+ options: {archive: './../dist/<%= filename %>-doc.zip'},
+ files: [{expand: true, cwd: './../dist/<%= filename %>/doc', src: ['**'], dest: '/'}]
+ },
+ 'release-sources' : { // the full repository with out the git stuff
+ options: { archive: './../dist/<%= filename %>-sources.zip'},
+ files: [
+ {expand: true, cwd: './../dist/<%= filename %>/sources', src: ['**'], dest: '/'},
+ ]
+ }
+ },
+ });
+
+
+
+ grunt.loadNpmTasks('grunt-contrib-compress');
+
+ //tasks
+ grunt.registerTask('dist',[
+ 'build',
+ 'doc',
+ 'clean:release-dist',
+ 'copy:release-lib','copy:release-doc','copy:release-sources',
+ 'compress:release-lib','compress:release-doc','compress:release-sources']);
+};
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3d06a1b0/odatajs/package.json
----------------------------------------------------------------------
diff --git a/odatajs/package.json b/odatajs/package.json
index 18eee26..7b50895 100644
--- a/odatajs/package.json
+++ b/odatajs/package.json
@@ -1,6 +1,6 @@
{
"name": "odatajs",
- "postfix" : "beta-01",
+ "postfix": "beta-01",
"title": "Olingo OData Client for Java Script",
"version": "4.0.0",
"description": "odatajs is a new cross-browser JavaScript library that enables data-centric web applications by leveraging modern protocols such as JSON and OData and HTML5-enabled browser features. It's designed to be small, fast and easy to use.",
@@ -35,6 +35,7 @@
"grunt-contrib-connect": "^0.7.1",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-uglify": "^0.4.0",
+ "grunt-curl": "^2.0.2",
"grunt-jsdoc": "^0.5.6",
"grunt-node-qunit": "^2.0.2",
"through": "^2.3.4"