You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2013/12/16 21:18:35 UTC
[01/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Updated Branches:
refs/heads/1964-feature-fauxton-build 834c7069d -> 730f6e684
Move Fauxton dist dir out of the src dir
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2c30f596
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2c30f596
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2c30f596
Branch: refs/heads/1964-feature-fauxton-build
Commit: 2c30f596a7f9dbe932856a93bed3f55ae35a9e6a
Parents: 834c706
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 16:44:44 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 16:44:44 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/src/Gruntfile.js | 70 ++++++++++++++++-----------------
1 file changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c30f596/share/www/fauxton/src/Gruntfile.js
----------------------------------------------------------------------
diff --git a/share/www/fauxton/src/Gruntfile.js b/share/www/fauxton/src/Gruntfile.js
index a54f80f..a6cff56 100644
--- a/share/www/fauxton/src/Gruntfile.js
+++ b/share/www/fauxton/src/Gruntfile.js
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
// Whitelist files and directories to be cleaned
// You'll always want to clean these two directories
// Now find the external addons you have and add them for cleaning up
- return _.union(["dist/", "app/load_addons.js"], cleanableAddons);
+ return _.union(["../dist/", "app/load_addons.js"], cleanableAddons);
}();
var assets = function(){
@@ -61,7 +61,7 @@ module.exports = function(grunt) {
less:{
paths: ["assets/less"],
files: {
- "dist/debug/css/fauxton.css": "assets/less/fauxton.less"
+ "../dist/debug/css/fauxton.css": "assets/less/fauxton.less"
}
},
img: ["assets/img/**"]
@@ -73,7 +73,7 @@ module.exports = function(grunt) {
if(path.existsSync(lessPath)){
// .less files exist for this addon
theAssets.less.paths.push(lessPath);
- theAssets.less.files["dist/debug/css/" + addon.name + ".css"] =
+ theAssets.less.files["../dist/debug/css/" + addon.name + ".css"] =
lessPath + "/" + addon.name + ".less";
}
// Images
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
var defaultSettings = {
"development": {
"src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
+ "dest": "../dist/debug/index.html",
"variables": {
"requirejs": "/assets/js/libs/require.js",
"css": "./css/index.css",
@@ -99,7 +99,7 @@ module.exports = function(grunt) {
},
"release": {
"src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
+ "dest": "../dist/debug/index.html",
"variables": {
"requirejs": "./js/require.js",
"css": "./css/index.css",
@@ -114,7 +114,7 @@ module.exports = function(grunt) {
grunt.initConfig({
- // The clean task ensures all files are removed from the dist/ directory so
+ // The clean task ensures all files are removed from the ../dist/ directory so
// that no files linger from previous builds.
clean: {
release: cleanable,
@@ -160,7 +160,7 @@ module.exports = function(grunt) {
// The concat task depends on this file to exist, so if you decide to
// remove this, ensure concat is updated accordingly.
jst: {
- "dist/debug/templates.js": [
+ "../dist/debug/templates.js": [
"app/templates/**/*.html",
"app/addons/**/templates/**/*.html"
]
@@ -170,21 +170,21 @@ module.exports = function(grunt) {
// The concatenate task is used here to merge the almond require/define
// shim and the templates into the application code. It's named
- // dist/debug/require.js, because we want to only load one script file in
+ // ../dist/debug/require.js, because we want to only load one script file in
// index.html.
concat: {
requirejs: {
- src: [ "assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"],
- dest: "dist/debug/js/require.js"
+ src: [ "assets/js/libs/require.js", "../dist/debug/templates.js", "../dist/debug/require.js"],
+ dest: "../dist/debug/js/require.js"
},
index_css: {
- src: ["dist/debug/css/*.css", 'assets/css/*.css'],
- dest: 'dist/debug/css/index.css'
+ src: ["../dist/debug/css/*.css", 'assets/css/*.css'],
+ dest: '../dist/debug/css/index.css'
},
test_config_js: {
- src: ["dist/debug/templates.js", "test/test.config.js"],
+ src: ["../dist/debug/templates.js", "test/test.config.js"],
dest: 'test/test.config.js'
},
},
@@ -192,8 +192,8 @@ module.exports = function(grunt) {
cssmin: {
compress: {
files: {
- "dist/release/css/index.css": [
- "dist/debug/css/index.css", 'assets/css/*.css',
+ "../dist/release/css/index.css": [
+ "../dist/debug/css/index.css", 'assets/css/*.css',
"app/addons/**/assets/css/*.css"
]
},
@@ -206,8 +206,8 @@ module.exports = function(grunt) {
uglify: {
release: {
files: {
- "dist/release/js/require.js": [
- "dist/debug/js/require.js"
+ "../dist/release/js/require.js": [
+ "../dist/debug/js/require.js"
]
}
}
@@ -215,7 +215,7 @@ module.exports = function(grunt) {
// Runs a proxy server for easier development, no need to keep deploying to couchdb
couchserver: {
- dist: './dist/debug/',
+ dist: './../dist/debug/',
port: 8000,
proxy: {
target: {
@@ -258,7 +258,7 @@ module.exports = function(grunt) {
mainConfigFile: "app/config.js",
// Output file.
- out: "dist/debug/require.js",
+ out: "../dist/debug/require.js",
// Root application module.
name: "config",
@@ -277,40 +277,40 @@ module.exports = function(grunt) {
couchdb: {
files: [
// this gets built in the template task
- {src: "dist/release/index.html", dest: "../build/index.html"},
- {src: ["**"], dest: "../build/js/", cwd:'dist/release/js/', expand: true},
- {src: ["**"], dest: "../build/img/", cwd:'dist/release/img/', expand: true},
- {src: ["**"], dest: "../build/css/", cwd:"dist/release/css/", expand: true}
+ {src: "../dist/release/index.html", dest: "../build/index.html"},
+ {src: ["**"], dest: "../build/js/", cwd:'../dist/release/js/', expand: true},
+ {src: ["**"], dest: "../build/img/", cwd:'../dist/release/img/', expand: true},
+ {src: ["**"], dest: "../build/css/", cwd:"../dist/release/css/", expand: true}
]
},
couchdebug: {
files: [
// this gets built in the template task
- {src: "dist/debug/index.html", dest: "../build/index.html"},
- {src: ["**"], dest: "../build/js/", cwd:'dist/debug/js/', expand: true},
- {src: ["**"], dest: "../build/img/", cwd:'dist/debug/img/', expand: true},
- {src: ["**"], dest: "../build/css/", cwd:"dist/debug/css/", expand: true}
+ {src: "../dist/debug/index.html", dest: "../build/index.html"},
+ {src: ["**"], dest: "../build/js/", cwd:'../dist/debug/js/', expand: true},
+ {src: ["**"], dest: "../build/img/", cwd:'../dist/debug/img/', expand: true},
+ {src: ["**"], dest: "../build/css/", cwd:"../dist/debug/css/", expand: true}
]
},
ace: {
files: [
- {src: "assets/js/libs/ace/worker-json.js", dest: "dist/release/js/ace/worker-json.js"},
- {src: "assets/js/libs/ace/mode-json.js", dest: "dist/release/js/ace/mode-json.js"},
- {src: "assets/js/libs/ace/theme-crimson_editor.js", dest: "dist/release/js/ace/theme-crimson_editor.js"},
- {src: "assets/js/libs/ace/mode-javascript.js", dest: "dist/release/js/ace/mode-javascript.js"},
- {src: "assets/js/libs/ace/worker-javascript.js", dest: "dist/release/js/ace/worker-javascript.js"},
+ {src: "assets/js/libs/ace/worker-json.js", dest: "../dist/release/js/ace/worker-json.js"},
+ {src: "assets/js/libs/ace/mode-json.js", dest: "../dist/release/js/ace/mode-json.js"},
+ {src: "assets/js/libs/ace/theme-crimson_editor.js", dest: "../dist/release/js/ace/theme-crimson_editor.js"},
+ {src: "assets/js/libs/ace/mode-javascript.js", dest: "../dist/release/js/ace/mode-javascript.js"},
+ {src: "assets/js/libs/ace/worker-javascript.js", dest: "../dist/release/js/ace/worker-javascript.js"},
]
},
dist:{
files:[
- {src: "dist/debug/index.html", dest: "dist/release/index.html"},
- {src: assets.img, dest: "dist/release/img/", flatten: true, expand: true}
+ {src: "../dist/debug/index.html", dest: "../dist/release/index.html"},
+ {src: assets.img, dest: "../dist/release/img/", flatten: true, expand: true}
]
},
debug:{
files:[
- {src: assets.img, dest: "dist/debug/img/", flatten: true, expand: true}
+ {src: assets.img, dest: "../dist/debug/img/", flatten: true, expand: true}
]
}
},
[03/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Move dist dir back
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/98aaf73e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/98aaf73e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/98aaf73e
Branch: refs/heads/1964-feature-fauxton-build
Commit: 98aaf73ef647437f5957239d893ac2546a0eb0f5
Parents: 6b614e9
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 16:53:12 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 16:53:12 2013 +0100
----------------------------------------------------------------------
.gitignore | 2 +-
share/www/fauxton/src/Gruntfile.js | 70 ++++++++++++++++-----------------
2 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/98aaf73e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f1130a3..2624829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,9 +60,9 @@ share/doc/build/html
share/doc/build/latex
share/doc/build/texinfo
share/www/fauxton/build
-share/www/fauxton/dist
share/www/fauxton/src/app/initialize.js
share/www/fauxton/src/app/load_addons.js
+share/www/fauxton/src/dist
share/www/fauxton/src/node_modules
share/server/main-coffee.js
share/server/main.js
http://git-wip-us.apache.org/repos/asf/couchdb/blob/98aaf73e/share/www/fauxton/src/Gruntfile.js
----------------------------------------------------------------------
diff --git a/share/www/fauxton/src/Gruntfile.js b/share/www/fauxton/src/Gruntfile.js
index a6cff56..a54f80f 100644
--- a/share/www/fauxton/src/Gruntfile.js
+++ b/share/www/fauxton/src/Gruntfile.js
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
// Whitelist files and directories to be cleaned
// You'll always want to clean these two directories
// Now find the external addons you have and add them for cleaning up
- return _.union(["../dist/", "app/load_addons.js"], cleanableAddons);
+ return _.union(["dist/", "app/load_addons.js"], cleanableAddons);
}();
var assets = function(){
@@ -61,7 +61,7 @@ module.exports = function(grunt) {
less:{
paths: ["assets/less"],
files: {
- "../dist/debug/css/fauxton.css": "assets/less/fauxton.less"
+ "dist/debug/css/fauxton.css": "assets/less/fauxton.less"
}
},
img: ["assets/img/**"]
@@ -73,7 +73,7 @@ module.exports = function(grunt) {
if(path.existsSync(lessPath)){
// .less files exist for this addon
theAssets.less.paths.push(lessPath);
- theAssets.less.files["../dist/debug/css/" + addon.name + ".css"] =
+ theAssets.less.files["dist/debug/css/" + addon.name + ".css"] =
lessPath + "/" + addon.name + ".less";
}
// Images
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
var defaultSettings = {
"development": {
"src": "assets/index.underscore",
- "dest": "../dist/debug/index.html",
+ "dest": "dist/debug/index.html",
"variables": {
"requirejs": "/assets/js/libs/require.js",
"css": "./css/index.css",
@@ -99,7 +99,7 @@ module.exports = function(grunt) {
},
"release": {
"src": "assets/index.underscore",
- "dest": "../dist/debug/index.html",
+ "dest": "dist/debug/index.html",
"variables": {
"requirejs": "./js/require.js",
"css": "./css/index.css",
@@ -114,7 +114,7 @@ module.exports = function(grunt) {
grunt.initConfig({
- // The clean task ensures all files are removed from the ../dist/ directory so
+ // The clean task ensures all files are removed from the dist/ directory so
// that no files linger from previous builds.
clean: {
release: cleanable,
@@ -160,7 +160,7 @@ module.exports = function(grunt) {
// The concat task depends on this file to exist, so if you decide to
// remove this, ensure concat is updated accordingly.
jst: {
- "../dist/debug/templates.js": [
+ "dist/debug/templates.js": [
"app/templates/**/*.html",
"app/addons/**/templates/**/*.html"
]
@@ -170,21 +170,21 @@ module.exports = function(grunt) {
// The concatenate task is used here to merge the almond require/define
// shim and the templates into the application code. It's named
- // ../dist/debug/require.js, because we want to only load one script file in
+ // dist/debug/require.js, because we want to only load one script file in
// index.html.
concat: {
requirejs: {
- src: [ "assets/js/libs/require.js", "../dist/debug/templates.js", "../dist/debug/require.js"],
- dest: "../dist/debug/js/require.js"
+ src: [ "assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"],
+ dest: "dist/debug/js/require.js"
},
index_css: {
- src: ["../dist/debug/css/*.css", 'assets/css/*.css'],
- dest: '../dist/debug/css/index.css'
+ src: ["dist/debug/css/*.css", 'assets/css/*.css'],
+ dest: 'dist/debug/css/index.css'
},
test_config_js: {
- src: ["../dist/debug/templates.js", "test/test.config.js"],
+ src: ["dist/debug/templates.js", "test/test.config.js"],
dest: 'test/test.config.js'
},
},
@@ -192,8 +192,8 @@ module.exports = function(grunt) {
cssmin: {
compress: {
files: {
- "../dist/release/css/index.css": [
- "../dist/debug/css/index.css", 'assets/css/*.css',
+ "dist/release/css/index.css": [
+ "dist/debug/css/index.css", 'assets/css/*.css',
"app/addons/**/assets/css/*.css"
]
},
@@ -206,8 +206,8 @@ module.exports = function(grunt) {
uglify: {
release: {
files: {
- "../dist/release/js/require.js": [
- "../dist/debug/js/require.js"
+ "dist/release/js/require.js": [
+ "dist/debug/js/require.js"
]
}
}
@@ -215,7 +215,7 @@ module.exports = function(grunt) {
// Runs a proxy server for easier development, no need to keep deploying to couchdb
couchserver: {
- dist: './../dist/debug/',
+ dist: './dist/debug/',
port: 8000,
proxy: {
target: {
@@ -258,7 +258,7 @@ module.exports = function(grunt) {
mainConfigFile: "app/config.js",
// Output file.
- out: "../dist/debug/require.js",
+ out: "dist/debug/require.js",
// Root application module.
name: "config",
@@ -277,40 +277,40 @@ module.exports = function(grunt) {
couchdb: {
files: [
// this gets built in the template task
- {src: "../dist/release/index.html", dest: "../build/index.html"},
- {src: ["**"], dest: "../build/js/", cwd:'../dist/release/js/', expand: true},
- {src: ["**"], dest: "../build/img/", cwd:'../dist/release/img/', expand: true},
- {src: ["**"], dest: "../build/css/", cwd:"../dist/release/css/", expand: true}
+ {src: "dist/release/index.html", dest: "../build/index.html"},
+ {src: ["**"], dest: "../build/js/", cwd:'dist/release/js/', expand: true},
+ {src: ["**"], dest: "../build/img/", cwd:'dist/release/img/', expand: true},
+ {src: ["**"], dest: "../build/css/", cwd:"dist/release/css/", expand: true}
]
},
couchdebug: {
files: [
// this gets built in the template task
- {src: "../dist/debug/index.html", dest: "../build/index.html"},
- {src: ["**"], dest: "../build/js/", cwd:'../dist/debug/js/', expand: true},
- {src: ["**"], dest: "../build/img/", cwd:'../dist/debug/img/', expand: true},
- {src: ["**"], dest: "../build/css/", cwd:"../dist/debug/css/", expand: true}
+ {src: "dist/debug/index.html", dest: "../build/index.html"},
+ {src: ["**"], dest: "../build/js/", cwd:'dist/debug/js/', expand: true},
+ {src: ["**"], dest: "../build/img/", cwd:'dist/debug/img/', expand: true},
+ {src: ["**"], dest: "../build/css/", cwd:"dist/debug/css/", expand: true}
]
},
ace: {
files: [
- {src: "assets/js/libs/ace/worker-json.js", dest: "../dist/release/js/ace/worker-json.js"},
- {src: "assets/js/libs/ace/mode-json.js", dest: "../dist/release/js/ace/mode-json.js"},
- {src: "assets/js/libs/ace/theme-crimson_editor.js", dest: "../dist/release/js/ace/theme-crimson_editor.js"},
- {src: "assets/js/libs/ace/mode-javascript.js", dest: "../dist/release/js/ace/mode-javascript.js"},
- {src: "assets/js/libs/ace/worker-javascript.js", dest: "../dist/release/js/ace/worker-javascript.js"},
+ {src: "assets/js/libs/ace/worker-json.js", dest: "dist/release/js/ace/worker-json.js"},
+ {src: "assets/js/libs/ace/mode-json.js", dest: "dist/release/js/ace/mode-json.js"},
+ {src: "assets/js/libs/ace/theme-crimson_editor.js", dest: "dist/release/js/ace/theme-crimson_editor.js"},
+ {src: "assets/js/libs/ace/mode-javascript.js", dest: "dist/release/js/ace/mode-javascript.js"},
+ {src: "assets/js/libs/ace/worker-javascript.js", dest: "dist/release/js/ace/worker-javascript.js"},
]
},
dist:{
files:[
- {src: "../dist/debug/index.html", dest: "../dist/release/index.html"},
- {src: assets.img, dest: "../dist/release/img/", flatten: true, expand: true}
+ {src: "dist/debug/index.html", dest: "dist/release/index.html"},
+ {src: assets.img, dest: "dist/release/img/", flatten: true, expand: true}
]
},
debug:{
files:[
- {src: assets.img, dest: "../dist/debug/img/", flatten: true, expand: true}
+ {src: assets.img, dest: "dist/debug/img/", flatten: true, expand: true}
]
}
},
[05/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Remove spurious img/img dir
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8414d6d4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8414d6d4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8414d6d4
Branch: refs/heads/1964-feature-fauxton-build
Commit: 8414d6d43c2469b4927c81a08edffb75a22c093f
Parents: 7221472
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 17:07:06 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 17:07:06 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8414d6d4/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index c31edab..ae97423 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -300,7 +300,6 @@ fauxton_build_files = \
build/img/fontcustom_fauxton.woff \
build/img/glyphicons-halflings-white.png \
build/img/glyphicons-halflings.png \
- build/img/img \
build/img/linen.png \
build/img/loader.gif \
build/img/minilogo.png \
@@ -312,6 +311,8 @@ fauxton_build_files = \
build/js/ace/worker-json.js \
build/js/require.js
+# @@ what is build/img/img doing there?
+
# @@ should we distribute these files?
# @@ clean share/www/fauxton/src/app/initialize.js
# @@ clean share/www/fauxton/src/app/load_addons.js
[06/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Fix install-data-local target
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/68ab6734
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/68ab6734
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/68ab6734
Branch: refs/heads/1964-feature-fauxton-build
Commit: 68ab673459ce2f730d1073ec57f47f8e50787273
Parents: 8414d6d
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 17:27:39 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 17:27:39 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/68ab6734/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index ae97423..b56a168 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -287,13 +287,13 @@ fauxton_src_files = \
fauxton_build_files = \
build/css/index.css \
+ build/img/FontAwesome.otf \
build/img/couchdb-site.png \
build/img/couchdblogo.png \
build/img/fontawesome-webfont.eot \
build/img/fontawesome-webfont.svg \
build/img/fontawesome-webfont.ttf \
build/img/fontawesome-webfont.woff \
- build/img/FontAwesome.otf \
build/img/fontcustom_fauxton.eot \
build/img/fontcustom_fauxton.svg \
build/img/fontcustom_fauxton.ttf \
@@ -352,14 +352,15 @@ fauxton.stamp: $(fauxton_src_files)
fi
install-data-local:
- for build_file in $(fauxton_build_files); do \
- if test -s $$build_file; then \
- inst_file=`echo $$build_file | sed s,^build,fauxton,`; \
- $(INSTALL) -d `dirname $(DESTDIR)$(localdatadir)/www/$$inst_file`; \
- $(INSTALL_DATA) \
- $$dist_file $(DESTDIR)$(localdatadir)/www/$$inst_file; \
- fi \
- done
+ echo hello
+ for build_file in $(fauxton_build_files); do \
+ if test -s $$build_file; then \
+ inst_file=`echo $$build_file | sed s,^build,fauxton,`; \
+ $(INSTALL) -d `dirname $(DESTDIR)$(localdatadir)/www/$$inst_file`; \
+ $(INSTALL_DATA) \
+ $$build_file $(DESTDIR)$(localdatadir)/www/$$inst_file; \
+ fi \
+ done
uninstall-local:
for build_file in $(fauxton_build_files); do \
[10/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Switch to using build-aux/missing
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/730f6e68
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/730f6e68
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/730f6e68
Branch: refs/heads/1964-feature-fauxton-build
Commit: 730f6e684d74c2b68db88abf0dc2a0a7003ad2fa
Parents: 864b69c
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 18:31:18 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 18:31:18 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/730f6e68/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index de7af3b..7d108a7 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -328,9 +328,9 @@ $(fauxton_build_files): fauxton.stamp
# @@ how is vpath handled?
# @@ need to handle missing grunt properly
-# @@ ./src/bin/grunt: line 18: ./src/bin/../node_modules/.bin/grunt: No such file or directory
-# @@ build-aux script. also conditional build section above
-# @@ also, why is it trying to build fauxton if we ship the build dir?
+# @@ conditional build section above?
+# @@ why is it trying to build fauxton if we ship the build dir?
+# @@ BUILT_SOURCES?
# @@ same question applies to the docs! very strange
fauxton.stamp: $(fauxton_src_files)
@@ -338,7 +338,9 @@ fauxton.stamp: $(fauxton_src_files)
if mkdir fauxton.lock 2>/dev/null; then \
rm -f fauxton.tmp; \
touch fauxton.tmp; \
- $(srcdir)/src/bin/grunt --gruntfile $(srcdir)/src/Gruntfile.js couchdb; \
+ $(top_srcdir)/build-aux/missing \
+ $(srcdir)/src/bin/grunt \
+ --gruntfile $(srcdir)/src/Gruntfile.js couchdb; \
mv -f fauxton.tmp $@; \
rmdir fauxton.lock; \
else \
@@ -367,9 +369,6 @@ uninstall-local:
fi \
done
-
-# @@ clean dist dir
-
DISTCLEANFILES = \
fauxton.stamp \
src/app/initialize.js \
[04/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Pull non-source files out of source files list
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/72214723
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/72214723
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/72214723
Branch: refs/heads/1964-feature-fauxton-build
Commit: 722147239ee8aa63bc0a1fd319d7476b2361846f
Parents: 98aaf73
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 16:53:35 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 16:53:35 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/72214723/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index 751d983..c31edab 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -83,7 +83,6 @@ fauxton_src_files = \
src/app/app.js \
src/app/config.js \
src/app/helpers.js \
- src/app/initialize.js \
src/app/load_addons.js.underscore \
src/app/main.js \
src/app/mixins.js \
@@ -313,12 +312,18 @@ fauxton_build_files = \
build/js/ace/worker-json.js \
build/js/require.js
+# @@ should we distribute these files?
+# @@ clean share/www/fauxton/src/app/initialize.js
+# @@ clean share/www/fauxton/src/app/load_addons.js
+
EXTRA_DIST = \
$(fauxton_src_files) \
$(fauxton_build_files)
BUILT_SOURCES = $(fauxton_build_files)
+# @@ clean dist dir
+
$(fauxton_build_files): fauxton.stamp
@if test -f $@; then :; else \
rm -f fauxton.stamp; \
[08/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Add note about DISTCHECK_CONFIGURE_FLAGS
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/974d63f3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/974d63f3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/974d63f3
Branch: refs/heads/1964-feature-fauxton-build
Commit: 974d63f3c292360a2f3702122f5592ddda2513c4
Parents: 6b0305b
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 18:30:42 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 18:30:42 2013 +0100
----------------------------------------------------------------------
DEVELOPERS | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/974d63f3/DEVELOPERS
----------------------------------------------------------------------
diff --git a/DEVELOPERS b/DEVELOPERS
index 6461184..b3e6512 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -260,6 +260,15 @@ If you're working on the build system itself, you can run:
This skips the tests allowing quicker `make' cycles.
+If you want to disable something for `make distcheck` you must pass down
+the `./configure` options through the environment.
+
+Run something like this:
+
+@@ this doens't work!
+
+ export DISTCHECK_CONFIGURE_FLAGS=--disable-tests
+
If you want to build it into different destination than `/usr/local`.
./configure --prefix=/<your directory path>
[02/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Updated .gitignore for new dist dir location
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6b614e9a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6b614e9a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6b614e9a
Branch: refs/heads/1964-feature-fauxton-build
Commit: 6b614e9a92964b12dec68b7cded6d61c1f67d378
Parents: 2c30f59
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 16:46:09 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 16:46:09 2013 +0100
----------------------------------------------------------------------
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6b614e9a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2624829..f1130a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,9 +60,9 @@ share/doc/build/html
share/doc/build/latex
share/doc/build/texinfo
share/www/fauxton/build
+share/www/fauxton/dist
share/www/fauxton/src/app/initialize.js
share/www/fauxton/src/app/load_addons.js
-share/www/fauxton/src/dist
share/www/fauxton/src/node_modules
share/server/main-coffee.js
share/server/main.js
[07/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Added notes about build bugs
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6b0305b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6b0305b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6b0305b8
Branch: refs/heads/1964-feature-fauxton-build
Commit: 6b0305b83df06e47b6e93c632ec53bf38e5915ad
Parents: 68ab673
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 17:46:15 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 17:46:15 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6b0305b8/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index b56a168..de7af3b 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -313,18 +313,12 @@ fauxton_build_files = \
# @@ what is build/img/img doing there?
-# @@ should we distribute these files?
-# @@ clean share/www/fauxton/src/app/initialize.js
-# @@ clean share/www/fauxton/src/app/load_addons.js
-
EXTRA_DIST = \
$(fauxton_src_files) \
$(fauxton_build_files)
BUILT_SOURCES = $(fauxton_build_files)
-# @@ clean dist dir
-
$(fauxton_build_files): fauxton.stamp
@if test -f $@; then :; else \
rm -f fauxton.stamp; \
@@ -333,8 +327,11 @@ $(fauxton_build_files): fauxton.stamp
# @@ how is vpath handled?
-# @@ fauxton_src_files includes files that are updated when grunt runs, so
-# @@ this command runs each time. need to seperate this variable out
+# @@ need to handle missing grunt properly
+# @@ ./src/bin/grunt: line 18: ./src/bin/../node_modules/.bin/grunt: No such file or directory
+# @@ build-aux script. also conditional build section above
+# @@ also, why is it trying to build fauxton if we ship the build dir?
+# @@ same question applies to the docs! very strange
fauxton.stamp: $(fauxton_src_files)
trap "rm -rf fauxton.lock fauxton.stamp" 1 2 13 15; \
@@ -370,7 +367,18 @@ uninstall-local:
fi \
done
-DISTCLEANFILES = html.stamp
+
+# @@ clean dist dir
+
+DISTCLEANFILES = \
+ fauxton.stamp \
+ src/app/initialize.js \
+ src/app/load_addons.js
distclean-local:
rm -fr build
+ rm -fr src/dist
+
+# @@ src/node_modules
+maintainerclean-local:
+ echo
[09/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Posted by ns...@apache.org.
Re-order lines in license.skip
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/864b69c0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/864b69c0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/864b69c0
Branch: refs/heads/1964-feature-fauxton-build
Commit: 864b69c07e58709c90f0b46c58a8859070690b82
Parents: 974d63f
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 18:30:58 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 18:30:58 2013 +0100
----------------------------------------------------------------------
license.skip | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/864b69c0/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 3bfa796..a1e3f10 100644
--- a/license.skip
+++ b/license.skip
@@ -84,6 +84,9 @@
^share/www/style/jquery-ui-1.8.11.custom.css
^share/www/fauxton/Makefile
^share/www/fauxton/Makefile.in
+^share/www/fauxton/build/img/.*
+^share/www/fauxton/build/js/ace/.*
+^share/www/fauxton/fauxton.stamp
^share/www/fauxton/src/app/addons/config/assets/less/config.less
^share/www/fauxton/src/app/modules/pouchdb/base.js
^share/www/fauxton/src/app/modules/pouchdb/pouch.collate.js
@@ -111,8 +114,6 @@
^share/www/fauxton/src/test/mocha/sinon.js
^share/www/fauxton/src/test/test.config.underscore
^share/www/fauxton/src/writing_addons.md
-^share/www/fauxton/build/img/.*
-^share/www/fauxton/build/js/ace/.*
^src/Makefile
^src/Makefile.in
^src/couch_index/Makefile