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/10/20 10:29:11 UTC
[2/2] git commit: [OLINGO-440] - move banner.txt
[OLINGO-440] - move banner.txt
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/419a4501
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/419a4501
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/419a4501
Branch: refs/heads/master
Commit: 419a4501052a3e064a049f5a0bede3e878d57a31
Parents: dca6ffd
Author: Sven Kobler <sv...@sap.com>
Authored: Mon Oct 20 10:29:03 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Mon Oct 20 10:29:03 2014 +0200
----------------------------------------------------------------------
odatajs/Gruntfile.js | 91 ++++++++++++++----------------------
odatajs/grunt-config/banner.txt | 18 +++++++
odatajs/grunt-config/release.js | 8 ++--
odatajs/package.json | 4 +-
odatajs/src/banner.txt | 19 --------
5 files changed, 58 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/419a4501/odatajs/Gruntfile.js
----------------------------------------------------------------------
diff --git a/odatajs/Gruntfile.js b/odatajs/Gruntfile.js
index 435584d..1a62695 100644
--- a/odatajs/Gruntfile.js
+++ b/odatajs/Gruntfile.js
@@ -29,16 +29,14 @@ module.exports = function(grunt) {
//options
var init = {
pkg: pkg,
- banner: grunt.file.read('src/banner.txt'),
+ banner: grunt.file.read('grunt-config/banner.txt'),
artifactname : artifactname,
"toBrowser" : {
"release" : {
- options: { index : "src/index-browser.js" },
- files: [{
- src: ["src/lib/**/*.js"],
- dest: "build/lib/<%= artifactname %>.js",
- }]
+ options: { index : "src/index-browser.js" },
+ src: ["src/lib/**/*.js"],
+ dest: "build/lib/<%= artifactname %>.js",
}
},
"uglify": { // uglify and minify the lib
@@ -46,63 +44,48 @@ module.exports = function(grunt) {
sourceMap : true,
sourceMapName : "build/lib/<%= artifactname %>.map",
sourceMapIncludeSources : true,
+ banner : "<%= banner %>",
},
- build: {
- src: "build/lib/<%= artifactname %>.js",
- dest: "build/lib/<%= artifactname %>.min.js"
+ "browser": {
+ src: "build/lib/<%= artifactname %>.js",
+ dest: "build/lib/<%= artifactname %>.min.js"
}
},
- "concat" : { // add the apache license headers
- options : {
- banner : "<%= banner %>"
- },
- licence: {
- src: "build/lib/<%= artifactname %>.js",
- dest: "build/lib/<%= artifactname %>.js",
- },
- licence_min: {
- src: "build/lib/<%= artifactname %>.min.js",
- dest: "build/lib/<%= artifactname %>.min.js",
- },
- },
"jsdoc" : {
- src : {
- src: ["src/**/*.js"],
- options: { destination: "build/doc-src", verbose : false }
- },
- test : {
- src: ["tests/**/*.js"],
- options: { destination: "build/doc-test", verbose : false }
- }
+ "src" : {
+ src: ["src/**/*.js"],
+ options: { destination: "build/doc-src", verbose : false }
+ },
+ "test" : {
+ src: ["tests/**/*.js"],
+ options: { destination: "build/doc-test", verbose : false }
+ }
},
"nugetpack" : { // create nuget pagckage
- dist: {
- src: 'grunt-config/nugetpack.nuspec',
- dest: 'build/'
- }
+ "dist": {
+ src: 'grunt-config/nugetpack.nuspec',
+ dest: 'build/'
+ }
},
"copy" : {
"to-latest" : {
- files: [
- {
- src :"build/lib/<%= artifactname %>.js",
- dest: "build/lib/odatajs-latest.js" },
- ]
+ src :"build/lib/<%= artifactname %>.js",
+ dest: "build/lib/odatajs-latest.js"
}
},
"npm-clean": {
options: {force: true},
"build": {
- src: [ "build"]
+ src: [ "build"]
},
},
"curl": {
"license": {
- src: {
- url: "http://apache.org/licenses/LICENSE-2.0.txt",
- proxy: "http://proxy:8080"
- },
- dest: "LICENSE"
+ src: {
+ url: "http://apache.org/licenses/LICENSE-2.0.txt",
+ proxy: "http://proxy:8080"
+ },
+ dest: "LICENSE"
}
}
};
@@ -120,7 +103,6 @@ module.exports = function(grunt) {
// Load tasks from npm modules ***/
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks("grunt-contrib-copy");
- grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-curl');
grunt.loadNpmTasks("grunt-jsdoc");
@@ -149,17 +131,14 @@ module.exports = function(grunt) {
// Create documentation in /build/doc
grunt.registerTask('doc', ['clearEnv', 'jsdoc:src']);
grunt.registerTask('doc-test', ['clearEnv', 'jsdoc:test']);
-
- // Build the odatajs library
-
-
- grunt.registerTask('test-browser', ['configureProxies:test-browser', 'connect:test-browser']);
- grunt.registerTask('test-node', ['node-qunit:default-tests']);
+
+ //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('update-legal', ['curl:license']);
-
- grunt.registerTask('build', ['clean:lib','toBrowser:release', 'uglify:build', 'concat:licence_min','copy:to-latest','nugetpack']);
+ // Build the odatajs library
+ grunt.registerTask('build', ['clean:lib','toBrowser:release', 'uglify:browser', 'copy:to-latest', 'nugetpack']);
grunt.registerTask('get-licence', ['curl:license']);
@@ -171,12 +150,12 @@ module.exports = function(grunt) {
'copy:release-lib','copy:release-doc','copy:release-sources',
'rat:dist', // check the license headers
'compress:release-lib','compress:release-doc','compress:release-sources',
- ]);
+ ]);
grunt.registerTask('release:sign',[
'sign:release','sign:asc','sign:asc-verify'
- ]);
+ ]);
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/419a4501/odatajs/grunt-config/banner.txt
----------------------------------------------------------------------
diff --git a/odatajs/grunt-config/banner.txt b/odatajs/grunt-config/banner.txt
new file mode 100644
index 0000000..042f3ce
--- /dev/null
+++ b/odatajs/grunt-config/banner.txt
@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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/419a4501/odatajs/grunt-config/release.js
----------------------------------------------------------------------
diff --git a/odatajs/grunt-config/release.js b/odatajs/grunt-config/release.js
index f163ca0..42b3fb4 100644
--- a/odatajs/grunt-config/release.js
+++ b/odatajs/grunt-config/release.js
@@ -59,8 +59,8 @@ module.exports = function(grunt) {
// copy
grunt.config.merge( {
- 'copy' : {
- 'release-lib' : {
+ "copy" : {
+ "release-lib" : {
files: [
{ expand: true, cwd: 'build/lib', src: ['<%= artifactname %>*.*'], dest: './../dist/<%= artifactname %>/lib/lib', filter: 'isFile'},
{ expand: true, src :'LICENSE',dest: './../dist/<%= artifactname %>/lib', filter: 'isFile' },
@@ -69,7 +69,7 @@ module.exports = function(grunt) {
{ expand: true, src :'README.md',dest: './../dist/<%= artifactname %>/lib', filter: 'isFile' }
]
},
- 'release-doc' : {
+ "release-doc" : {
files: [
{ expand: true, cwd: 'build/doc-src', src: ['**'], dest: './../dist/<%= artifactname %>/doc/doc', filter: 'isFile'},
{ expand: true, src :'LICENSE',dest: './../dist/<%= artifactname %>/doc', filter: 'isFile' },
@@ -78,7 +78,7 @@ module.exports = function(grunt) {
{ expand: true, src :'README.md',dest: './../dist/<%= artifactname %>/doc', filter: 'isFile' }
]
},
- 'release-sources' : {
+ "release-sources" : {
files: [
{ expand: true, src :'LICENSE',dest: './../dist/<%= artifactname %>/sources', filter: 'isFile' },
{ expand: true, src :'NOTICE',dest: './../dist/<%= artifactname %>/sources', filter: 'isFile' },
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/419a4501/odatajs/package.json
----------------------------------------------------------------------
diff --git a/odatajs/package.json b/odatajs/package.json
index 0d5e152..298a4e2 100644
--- a/odatajs/package.json
+++ b/odatajs/package.json
@@ -36,12 +36,10 @@
"grunt-connect-proxy": "^0.1.10",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-compress": "^0.10.0",
- "grunt-contrib-concat": "^0.5.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-curl": "^2.0.2",
"grunt-jsdoc": "^0.5.6",
- "grunt-nuget": "^0.1.3",
- "through": "^2.3.4"
+ "grunt-nuget": "^0.1.3"
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/419a4501/odatajs/src/banner.txt
----------------------------------------------------------------------
diff --git a/odatajs/src/banner.txt b/odatajs/src/banner.txt
deleted file mode 100644
index edbaff2..0000000
--- a/odatajs/src/banner.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
\ No newline at end of file