incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [13/13] git commit: Cleaned up the build file and made sure sourcemaps worked
Date Thu, 03 Jul 2014 23:04:46 GMT
Cleaned up the build file and made sure sourcemaps worked


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/3b0bde88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/3b0bde88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/3b0bde88

Branch: refs/heads/apache-blur-0.2
Commit: 3b0bde888afdcec9d1caf9ffc24bd2533ccb459a
Parents: fb1f8a3
Author: Chris Rohr <rohr.chris@gmail.com>
Authored: Thu Jul 3 19:04:26 2014 -0400
Committer: Chris Rohr <rohr.chris@gmail.com>
Committed: Thu Jul 3 19:04:26 2014 -0400

----------------------------------------------------------------------
 blur-console/src/main/webapp/Gruntfile.js       | 38 ++++++--------------
 ...console.8c2cfd026556540d0e30e0da8b9ffc56.css |  1 +
 .../src/main/webapp/public/css/blurconsole.css  |  2 +-
 ...ole.css.68c2c19adf96ebf38039bd94cd1b6ef3.map |  1 +
 .../main/webapp/public/css/blurconsole.css.map  |  1 +
 ...console.e6a0e8ef14294aab8f3772f78a54938a.css |  1 -
 blur-console/src/main/webapp/public/index.html  |  4 +--
 ...rconsole.30907698bb5cd04fc79379cdc68bf683.js | 27 --------------
 ...rconsole.643484dbadaf82dccfd37db3fe370208.js | 27 ++++++++++++++
 .../src/main/webapp/public/js/blurconsole.js    | 12 +++----
 ...sole.js.13e45f7dcc18364f8967d5ac8cac7214.map |  1 -
 ...sole.js.61680973ed09804cc51c7fee1133d126.map |  1 +
 .../main/webapp/public/js/blurconsole.js.map    |  2 +-
 13 files changed, 51 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/3b0bde88/blur-console/src/main/webapp/Gruntfile.js
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/Gruntfile.js b/blur-console/src/main/webapp/Gruntfile.js
index 27e1929..b834ccb 100644
--- a/blur-console/src/main/webapp/Gruntfile.js
+++ b/blur-console/src/main/webapp/Gruntfile.js
@@ -31,12 +31,12 @@ module.exports = function (grunt) {
     var all_js_files = [
         'libs/jquery/dist/jquery.js',
         'js/utils/*\.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/tooltip.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/modal.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/transition.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/popover.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/collapse.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/tab.js',
+        'libs/bootstrap/js/tooltip.js',
+        'libs/bootstrap/js/modal.js',
+        'libs/bootstrap/js/transition.js',
+        'libs/bootstrap/js/popover.js',
+        'libs/bootstrap/js/collapse.js',
+        'libs/bootstrap/js/tab.js',
         'libs/flot/jquery.flot.js',
         'libs/flot/jquery.flot.pie.js',
         'libs/flot/jquery.flot.categories.js',
@@ -75,6 +75,10 @@ module.exports = function (grunt) {
         less: {
             options: {
                 sourceMap: true,
+                sourceMapFilename: 'public/css/blurconsole.css.map',
+                sourceMapURL: '/css/blurconsole.css.map',
+                sourceMapBasepath: 'public',
+                sourceMapRootpath: '/',
                 dumpLineNumbers: true,
                 paths: ['libs']
             },
@@ -93,28 +97,6 @@ module.exports = function (grunt) {
             }
         },
 
-        // Compiles Sass to CSS and generates necessary files if requested
-        sass: {
-            options: {
-                sourcemap: true,
-                lineNumbers: true,
-                loadPath: ['libs']
-            },
-            development: {
-                files: {
-                    'public/css/blurconsole.css': 'sass/blurconsole.scss'
-                }
-            },
-            production: {
-                files: {
-                    'public/css/blurconsole.css': 'sass/blurconsole.scss'
-                },
-                options: {
-                    style: 'compressed'
-                }
-            }
-        },
-
         uglify: {
             js: {
                 options: {


Mime
View raw message