usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [21/39] git commit: changing build process to add build-release
Date Wed, 02 Apr 2014 21:21:22 GMT
changing build process to add build-release


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2f496a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2f496a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2f496a49

Branch: refs/pull/92/merge
Commit: 2f496a497201f24235b0b502f934c3c0cd4ae823
Parents: 37e5c23
Author: Shawn Feldman <shawn.feldman@gmail.com>
Authored: Wed Apr 2 08:28:30 2014 -0600
Committer: Shawn Feldman <shawn.feldman@gmail.com>
Committed: Wed Apr 2 08:28:30 2014 -0600

----------------------------------------------------------------------
 .gitignore                                      |    8 +-
 portal/Gruntfile.js                             |    5 +-
 .../js/libs/usergrid-libs.min.js                |    2 +-
 .../dist/usergrid-portal/js/usergrid-dev.min.js |    2 +-
 portal/dist/usergrid-portal/js/usergrid.min.js  |    2 +-
 portal/js/libs/usergrid-libs.min.js             |   22 -
 portal/js/usergrid-dev.min.js                   | 4939 ------------------
 portal/js/usergrid.min.js                       |    6 -
 .../instrument/js/usergrid-coverage.min.js      |    6 -
 .../test/coverage/instrument/js/usergrid.min.js |    3 -
 10 files changed, 13 insertions(+), 4982 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f496a49/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2bd4952..0da9432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,15 @@ Icon
 /portal/dist-cov/
 /portal/bower_components
 /portal/.idea
+/portal/2.0.**
+/portal/js/libs/*.js
+/portal/js/usergrid.min.js
+/portal/js/usergrid-dev.min.js
+/portal/test/coverage/instrument/js/usergrid-coverage.min.js
+/portal/test/coverage/instrument/js/usergrid.min.js
 /stack/corepersistence/priamcluster/aws.properties
 #Webstorm artifacts
 .idea/
-portal/2.0.**
 stack/corepersistence/collection/nbactions.xml
 stack/corepersistence/graph/nbactions.xml
 stack/corepersistence/model/nbactions.xml
@@ -29,3 +34,4 @@ stack/corepersistence/nbactions.xml
 stack/corepersistence/queryindex/nbactions.xml
 stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
 stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f496a49/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index 413d9fd..63d61ce 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -398,7 +398,9 @@ module.exports = function (grunt) {
   grunt.registerTask('validate', ['jshint', 'complexity']);
   grunt.registerTask('report', ['build', 'coverage']);
 
-  grunt.registerTask('build-dev', [ 'ngtemplates','uglify:usergrid-dev','uglify:usergrid',
'cssmin','dom_munger','copy:versioned','karma:unit']);
+  grunt.registerTask('build-release', ['clean:build','bower:install','ngtemplates', 'uglify','cssmin','dom_munger','copy','compress']);
+  grunt.registerTask('build', ['bower:install','ngtemplates', 'uglify','cssmin','dom_munger','karma:unit']);
+  grunt.registerTask('build-dev', [ 'ngtemplates','uglify:usergrid-dev','uglify:usergrid',
'cssmin','dom_munger','karma:unit']);
   grunt.registerTask('build-coverage', [ 'ngtemplates','instrument','uglify:usergrid-coverage','uglify:usergrid-coverage-min',
'cssmin','dom_munger', 'copy:coverage']);
 
   grunt.registerTask('default', ['build','karma:unit']);
@@ -414,5 +416,4 @@ module.exports = function (grunt) {
 
   grunt.registerTask('no-monitoring', ['build','clean:perf','karma:unit','compress']);
 
-  grunt.registerTask('build', ['clean:build','bower:install','ngtemplates', 'uglify','cssmin','dom_munger','copy','compress']);
 };


Mime
View raw message