couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [1/2] git commit: remove BBB dependancy COUCHDB-1712
Date Mon, 18 Mar 2013 15:19:30 GMT
remove BBB dependancy COUCHDB-1712


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b19cd925
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b19cd925
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b19cd925

Branch: refs/heads/1712-feature-remove-bbb
Commit: b19cd9253b6fe0ad14effcf9d3bc3fc000a39ef2
Parents: 2172a0b
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Mar 18 15:00:10 2013 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Mon Mar 18 15:00:10 2013 +0200

----------------------------------------------------------------------
 src/fauxton/grunt.js     |   29 +++++++++++++++++------------
 src/fauxton/package.json |    2 +-
 src/fauxton/readme.md    |    8 ++++----
 3 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b19cd925/src/fauxton/grunt.js
----------------------------------------------------------------------
diff --git a/src/fauxton/grunt.js b/src/fauxton/grunt.js
index 875316b..26a65bc 100644
--- a/src/fauxton/grunt.js
+++ b/src/fauxton/grunt.js
@@ -188,23 +188,26 @@ module.exports = function(grunt) {
 
     watch: {
       files: './app/**/*',
-      tasks: ['debug', 'template:server']
+      tasks: ['debug', 'template']
     },
 
-    // This task uses James Burke's excellent r.js AMD build tool.  In the
-    // future other builders may be contributed as drop-in alternatives.
     requirejs: {
-      // Include the main configuration file.
-      mainConfigFile: "app/config.js",
+      compile: {
+        options: {
+          baseUrl: 'app',
+          // Include the main configuration file.
+          mainConfigFile: "app/config.js",
 
-      // Output file.
-      out: "dist/debug/require.js",
+          // Output file.
+          out: "dist/debug/require.js",
 
-      // Root application module.
-      name: "config",
+          // Root application module.
+          name: "config",
 
-      // Do not wrap everything in an IIFE.
-      wrap: false
+          // Do not wrap everything in an IIFE.
+          wrap: false
+      }
+      }
     },
 
     // The headless QUnit testing environment is provided for "free" by Grunt.
@@ -284,9 +287,11 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-couchapp');
   // Load the copy task
   grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib');
   // Load the exec task
   grunt.loadNpmTasks('grunt-exec');
-
+  // Load Require.js task
+  grunt.loadNpmTasks('grunt-requirejs');
   // clean out previous build artefacts, lint and unit test
   grunt.registerTask('test', 'clean lint'); //qunit
   // Fetch dependencies (from git or local dir), lint them and make load_addons

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b19cd925/src/fauxton/package.json
----------------------------------------------------------------------
diff --git a/src/fauxton/package.json b/src/fauxton/package.json
index a5fc567..8d24935 100644
--- a/src/fauxton/package.json
+++ b/src/fauxton/package.json
@@ -9,13 +9,13 @@
   "dependencies": {
     "async": "~0.1.22",
     "grunt": "~0.3.17",
-    "bbb": "0.1.16",
     "couchapp": "0.9.1",
     "grunt-contrib": "0.0.8",
     "grunt-contrib-copy": "~0.3.2",
     "grunt-couchapp": "~0.1.0",
     "grunt-exec": "~0.3.0",
     "grunt-jasmine-task": "~0.2.0",
+    "grunt-requirejs": "0.3.1",
     "underscore": "~1.4.2",
     "url": "~0.7.9",
     "urls": "~0.0.3",

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b19cd925/src/fauxton/readme.md
----------------------------------------------------------------------
diff --git a/src/fauxton/readme.md b/src/fauxton/readme.md
index 409296f..361d62a 100644
--- a/src/fauxton/readme.md
+++ b/src/fauxton/readme.md
@@ -36,19 +36,19 @@ A recent of [node.js](http://nodejs.org/) and npm is required.
 		# Or just use the wrappers in ./bin/
 
     # Development mode, non minified files
-    ./bin/bbb couchdebug
+    ./bin/grunt couchdebug
 
     # Or fully compiled install
-    # ./bin/bbb couchdb
+    # ./bin/grunt couchdb
 
 ### Dev Server
     Using the dev server is the easiest way to use fauxton, specially when developing for
it.
 
-    bbb dev
+    grunt dev
 
 ### To Deploy Fauxton
 
-    ./bin/bbb couchapp_deploy - to deploy to your local [Couchdb instance] (http://localhost:5984/fauxton/_design/fauxton/index.html)
+    ./bin/grunt couchapp_deploy - to deploy to your local [Couchdb instance] (http://localhost:5984/fauxton/_design/fauxton/index.html)
 
 ## Understang Fauxton Code layout
 


Mime
View raw message