You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/01/09 21:43:29 UTC
[1/4] incubator-brooklyn git commit: Docs: Swaps link-checker gem for
html-proofer
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 66f440f96 -> b2474e579
Docs: Swaps link-checker gem for html-proofer
Incorporated into build.sh. Skip with --skip-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/121d7f3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/121d7f3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/121d7f3a
Branch: refs/heads/master
Commit: 121d7f3a243a4f4a5d868a64366c1d6f4c5524d0
Parents: aa31755
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Jan 7 11:57:19 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Jan 9 15:56:13 2015 +0000
----------------------------------------------------------------------
docs/Gemfile | 2 +-
docs/Gemfile.lock | 29 +++++++++++++++++------------
docs/_build/build.sh | 18 ++++++++++++++++++
3 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/121d7f3a/docs/Gemfile
----------------------------------------------------------------------
diff --git a/docs/Gemfile b/docs/Gemfile
index aacd3c9..3a2621a 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -5,5 +5,5 @@ source 'https://rubygems.org'
gem 'jekyll'
gem 'therubyracer'
-gem 'link-checker'
+gem 'html-proofer'
gem 'json'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/121d7f3a/docs/Gemfile.lock
----------------------------------------------------------------------
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index ada2724..e3389ee 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,9 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- anemone (0.7.2)
- nokogiri (>= 1.3.0)
- robotex (>= 1.0.0)
+ addressable (2.3.6)
blankslate (2.1.2.4)
celluloid (0.16.0)
timers (~> 4.0.0)
@@ -14,11 +12,21 @@ GEM
execjs
coffee-script-source (1.8.0)
colorator (0.1)
- colorize (0.5.8)
+ colored (1.2)
+ ethon (0.7.2)
+ ffi (>= 1.3.0)
execjs (2.2.2)
fast-stemmer (1.0.2)
ffi (1.9.6)
hitimes (1.2.2)
+ html-proofer (1.6.0)
+ addressable (~> 2.3)
+ colored (~> 1.2)
+ mercenary (~> 0.3.2)
+ nokogiri (~> 1.5)
+ parallel (~> 1.3)
+ typhoeus (~> 0.6.7)
+ yell (~> 2.0)
jekyll (2.5.2)
classifier-reborn (~> 2.0)
colorator (~> 0.1)
@@ -45,11 +53,6 @@ GEM
json (1.8.1)
kramdown (1.5.0)
libv8 (3.16.14.7)
- link-checker (0.7.2)
- anemone (~> 0.7.2)
- colorize (~> 0.5.8)
- nokogiri (~> 1.5.5)
- trollop (~> 2.0)
liquid (2.6.1)
listen (2.8.3)
celluloid (>= 0.15.2)
@@ -57,6 +60,7 @@ GEM
rb-inotify (>= 0.9)
mercenary (0.3.5)
nokogiri (1.5.11)
+ parallel (1.3.3)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.8)
@@ -68,7 +72,6 @@ GEM
ffi (>= 0.5.0)
redcarpet (3.2.2)
ref (1.0.5)
- robotex (1.0.0)
safe_yaml (1.0.4)
sass (3.4.9)
therubyracer (0.12.1)
@@ -78,14 +81,16 @@ GEM
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
- trollop (2.0)
+ typhoeus (0.6.9)
+ ethon (>= 0.7.1)
yajl-ruby (1.1.0)
+ yell (2.0.5)
PLATFORMS
ruby
DEPENDENCIES
+ html-proofer
jekyll
json
- link-checker
therubyracer
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/121d7f3a/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index efbffc6..dcfbb8f 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -29,6 +29,7 @@ function help() {
echo "* --quick-javadoc : to do a quick javadoc build (for testing)"
echo "* --serve : serve files from _site after building (for testing)"
echo "* --install : install files from _site to the appropriate place in "'$'"BROOKLYN_SITE_DIR (or ../../incubator-brooklyn-site-public)"
+ echo "* --skip-test : skip the HTML Proof run on _site"
echo ""
}
@@ -130,6 +131,10 @@ function parse_arguments() {
INSTALL_AFTERWARDS=true
shift
;;
+ "--skip-test")
+ SKIP_TEST=true
+ shift
+ ;;
*)
echo "ERROR: invalid argument '"$1"'"
exit 1
@@ -138,6 +143,17 @@ function parse_arguments() {
done
}
+# Runs htmlproof against _site
+function test_site() {
+ if [ "$SKIP_TEST" == "true" ]; then
+ return
+ fi
+ echo "Running htmlproof on _site"
+ mkdir -p target
+ LOG="target/htmlproof.log"
+ htmlproof _site 2>&1 | tee $LOG
+}
+
function make_jekyll() {
echo JEKYLL running with: jekyll build $JEKYLL_CONFIG
jekyll build --config $JEKYLL_CONFIG || return 1
@@ -228,6 +244,8 @@ make_jekyll || { echo ERROR: failed jekyll docs build in `pwd` ; exit 1 ; }
make_javadoc || { echo ERROR: failed javadoc build ; exit 1 ; }
+test_site
+
# TODO build catalog
# TODO install
[4/4] incubator-brooklyn git commit: This closes #438
Posted by he...@apache.org.
This closes #438
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b2474e57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b2474e57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b2474e57
Branch: refs/heads/master
Commit: b2474e5791d7a9e207276e70379dfa55f9d59f76
Parents: 706ed6e 121d7f3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jan 9 19:05:10 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jan 9 19:05:10 2015 +0000
----------------------------------------------------------------------
docs/Gemfile | 2 +-
docs/Gemfile.lock | 29 +++++++++++++++++------------
docs/_build/build.sh | 18 ++++++++++++++++++
3 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b2474e57/docs/_build/build.sh
----------------------------------------------------------------------
[3/4] incubator-brooklyn git commit: This closes #424
Posted by he...@apache.org.
This closes #424
slight tweaks because master had been reverted
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/706ed6ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/706ed6ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/706ed6ec
Branch: refs/heads/master
Commit: 706ed6ec9093b8912b9b4c67cf7ecf431993ce73
Parents: 66f440f be59c90
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jan 9 19:04:48 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jan 9 19:04:48 2015 +0000
----------------------------------------------------------------------
docs/_build/make-javadoc.sh | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/706ed6ec/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --cc docs/_build/make-javadoc.sh
index fdf7064,4581f40..1a80efd
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@@ -19,6 -20,15 +20,16 @@@ mkdir -p targe
rm -rf target/$JAVADOC_TARGET1_SUBPATH/
export DATESTAMP=`date "+%Y-%m-%d"`
++
+ # BROOKLYN_VERSION_BELOW
+ export BROOKLYN_JAVADOC_CLASSPATH=../../usage/all/target/brooklyn-all-0.7.0-SNAPSHOT-with-dependencies.jar
+
+ if [ \! -f ${BROOKLYN_JAVADOC_CLASSPATH} ]; then
+ echo "Expected to find ${BROOKLYN_JAVADOC_CLASSPATH}"
+ echo "Please run a full Maven build in the project root"
+ exit 1
+ fi
+
echo "building javadoc at $DATESTAMP from:
$SOURCE_PATHS"
@@@ -26,7 -36,7 +37,7 @@@ javadoc -sourcepath $SOURCE_PATHS
-public \
-d target/$JAVADOC_TARGET1_SUBPATH/ \
-subpackages "org.apache.brooklyn:io.brooklyn:brooklyn" \
- -classpath ../../usage/all/target/brooklyn-all-0.7.0-SNAPSHOT-with-dependencies.jar \
- -classpath "$BROOKLYN_JAVADOC_CLASSPATH" \
++ -classpath "${BROOKLYN_JAVADOC_CLASSPATH}" \
-doctitle "Apache Brooklyn" \
-windowtitle "Apache Brooklyn" \
-header "Apache Brooklyn" \
[2/4] incubator-brooklyn git commit: Fixes to make_javadoc.sh script
Posted by he...@apache.org.
Fixes to make_javadoc.sh script
Three changes: BROOKLYN_VERSION annotation to ensure that 0.7.0-SNAPSHOT
reference is updated. Javadoc output spews out a lot of noise to stdout
and errors/warnings to stderr, but use of 'tee' saves only stdout noise
and not the useful error messages - changed to send errors to stdout,
and what was stdout goes to /dev/null. Finally, abort if the required
brooklyn-all-dependencies jar file has not been built.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/be59c906
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/be59c906
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/be59c906
Branch: refs/heads/master
Commit: be59c906fa3953eb6cf43f60d2edcf0f8a7bf0ac
Parents: 4b290dd
Author: Richard Downer <ri...@apache.org>
Authored: Tue Dec 23 14:55:09 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Jan 9 16:30:50 2015 +0000
----------------------------------------------------------------------
docs/_build/make-javadoc.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be59c906/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_build/make-javadoc.sh b/docs/_build/make-javadoc.sh
index ccc1772..4581f40 100755
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@ -16,11 +16,19 @@ else
export SOURCE_PATHS=$BROOKLYN_JAVADOC_SOURCE_PATHS
fi
+mkdir -p target
rm -rf target/$JAVADOC_TARGET1_SUBPATH/
export DATESTAMP=`date "+%Y-%m-%d"`
# BROOKLYN_VERSION_BELOW
export BROOKLYN_JAVADOC_CLASSPATH=../../usage/all/target/brooklyn-all-0.7.0-SNAPSHOT-with-dependencies.jar
+
+if [ \! -f ${BROOKLYN_JAVADOC_CLASSPATH} ]; then
+ echo "Expected to find ${BROOKLYN_JAVADOC_CLASSPATH}"
+ echo "Please run a full Maven build in the project root"
+ exit 1
+fi
+
echo "building javadoc at $DATESTAMP from:
$SOURCE_PATHS"
@@ -33,7 +41,7 @@ javadoc -sourcepath $SOURCE_PATHS \
-windowtitle "Apache Brooklyn" \
-header "Apache Brooklyn" \
-footer '<b>Apache Brooklyn - Multi-Cloud Application Management</b> <br/> <a href="http://brooklyn.io/" target="_top">brooklyn.io</a>. Apache License. © '$DATESTAMP'.' \
- | tee target/javadoc.log
+2>&1 1>/dev/null | tee target/javadoc.log
if ((${PIPESTATUS[0]})) ; then echo ; echo ; echo "ERROR: javadoc process exited non-zero" ; exit 1 ; fi
echo ; echo