You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by qu...@apache.org on 2017/01/10 16:14:04 UTC
[1/4] incubator-edgent-website git commit: [EDGENT-327] Use local
Javadoc URLs
Repository: incubator-edgent-website
Updated Branches:
refs/heads/master 0fbd28090 -> e9dfca502
[EDGENT-327] Use local Javadoc URLs
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/commit/7080f26d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/tree/7080f26d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/diff/7080f26d
Branch: refs/heads/master
Commit: 7080f26d0ba23b5de8ee933f5a37bb88e1123ac3
Parents: 0fbd280
Author: Queenie Ma <qu...@gmail.com>
Authored: Thu Jan 5 11:10:51 2017 -0800
Committer: Queenie Ma <qu...@gmail.com>
Committed: Mon Jan 9 09:19:29 2017 -0800
----------------------------------------------------------------------
build.sh | 1 +
site/_config.yml | 4 ++--
site/_data/mydoc/mydoc_topnav.yml | 8 ++++----
site/favicon.ico | Bin 0 -> 1150 bytes
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index 5ef9992..9cabe81 100644
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,7 @@
set -e
cd site
jekyll build -d ../content_tmp
+sed -i "" "/^@import/d; s/'DejaVu Sans',//g; s/'DejaVu Sans Mono',//g; s/'DejaVu Serif',//g" ../content_tmp/javadoc/*/stylesheet.css
COMMIT_HASH=`git rev-parse HEAD`
cd ..
git checkout asf-site
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index 0fa3656..e51c4d1 100755
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -126,9 +126,9 @@ host: 127.0.0.1
sourcerepourl: https://github.com/apache/incubator-edgent
downloadsurl: /docs/downloads
projurl: /
-#docsurl: /javadoc/latest
+docsurl: /javadoc/latest
# above yields things like the following when running on a "jekyll serve" test server
# [2016-12-22 15:23:31] ERROR `/favicon.ico' not found.
# [2016-12-22 15:33:17] ERROR `/javadoc/latest/resources/fonts/dejavu.css' not found.
# the following is undesirable as it doesn't link to the "jekyll serve" test server
-docsurl: https://edgent.incubator.apache.org/javadoc/latest
+# docsurl: https://edgent.incubator.apache.org/javadoc/latest
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/site/_data/mydoc/mydoc_topnav.yml
----------------------------------------------------------------------
diff --git a/site/_data/mydoc/mydoc_topnav.yml b/site/_data/mydoc/mydoc_topnav.yml
index 8fb9c7a..38141ab 100644
--- a/site/_data/mydoc/mydoc_topnav.yml
+++ b/site/_data/mydoc/mydoc_topnav.yml
@@ -60,8 +60,8 @@ javadoc_dropdowns:
version: all
output: web
items:
- - title: lastest
- external_url: http://edgent.incubator.apache.org/javadoc/latest/index.html
+ - title: latest
+ url: /..\/javadoc\/latest
audience: writers, designers
platform: all
product: all
@@ -69,7 +69,7 @@ javadoc_dropdowns:
output: web
- title: 1.0.0
- external_url: http://edgent.incubator.apache.org/javadoc/r1.0.0/index.html
+ url: /..\/javadoc\/r1.0.0
audience: writers, designers
platform: all
product: all
@@ -77,7 +77,7 @@ javadoc_dropdowns:
output: web
- title: 0.4.0
- external_url: http://edgent.incubator.apache.org/javadoc/r0.4.0/index.html
+ url: /..\/javadoc\/r0.4.0
audience: writers, designers
platform: all
product: all
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/site/favicon.ico
----------------------------------------------------------------------
diff --git a/site/favicon.ico b/site/favicon.ico
new file mode 100644
index 0000000..7a1f9ac
Binary files /dev/null and b/site/favicon.ico differ
[4/4] incubator-edgent-website git commit: [EDGENT-327] Improve regex
expressions in build.sh
Posted by qu...@apache.org.
[EDGENT-327] Improve regex expressions in build.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/commit/e9dfca50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/tree/e9dfca50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/diff/e9dfca50
Branch: refs/heads/master
Commit: e9dfca502948919c4bed99a1bcf599af09b4b0be
Parents: dc48549
Author: Queenie Ma <qu...@gmail.com>
Authored: Mon Jan 9 16:22:37 2017 -0800
Committer: Queenie Ma <qu...@gmail.com>
Committed: Mon Jan 9 16:22:37 2017 -0800
----------------------------------------------------------------------
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/e9dfca50/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index eaefe98..b494149 100644
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@ set -e
cd site
jekyll build -d ../content_tmp
# Remove dangling references to the DejaVu fonts in the Javadoc stylesheets
-sed -i "" "/^@import/d; s/'DejaVu Sans',//g; s/'DejaVu Sans Mono',//g; s/'DejaVu Serif',//g" ../content_tmp/javadoc/*/stylesheet.css
+sed -i "" "/^@import.*dejavu.css/d; s/'DejaVu[^']*',//g" ../content_tmp/javadoc/*/stylesheet.css
COMMIT_HASH=`git rev-parse HEAD`
cd ..
git checkout asf-site
[3/4] incubator-edgent-website git commit: [EDGENT-327] Remove
unnecessary comments in _config.yml
Posted by qu...@apache.org.
[EDGENT-327] Remove unnecessary comments in _config.yml
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/commit/dc48549a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/tree/dc48549a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/diff/dc48549a
Branch: refs/heads/master
Commit: dc48549ad3432472ce6b73569d36b670435b6278
Parents: f63bd7a
Author: Queenie Ma <qu...@gmail.com>
Authored: Mon Jan 9 12:10:08 2017 -0800
Committer: Queenie Ma <qu...@gmail.com>
Committed: Mon Jan 9 12:10:08 2017 -0800
----------------------------------------------------------------------
site/_config.yml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/dc48549a/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index e51c4d1..a1d825e 100755
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -127,8 +127,3 @@ sourcerepourl: https://github.com/apache/incubator-edgent
downloadsurl: /docs/downloads
projurl: /
docsurl: /javadoc/latest
-# above yields things like the following when running on a "jekyll serve" test server
-# [2016-12-22 15:23:31] ERROR `/favicon.ico' not found.
-# [2016-12-22 15:33:17] ERROR `/javadoc/latest/resources/fonts/dejavu.css' not found.
-# the following is undesirable as it doesn't link to the "jekyll serve" test server
-# docsurl: https://edgent.incubator.apache.org/javadoc/latest
[2/4] incubator-edgent-website git commit: [EDGENT-327] Add comment
to build.sh
Posted by qu...@apache.org.
[EDGENT-327] Add comment to build.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/commit/f63bd7a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/tree/f63bd7a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/diff/f63bd7a2
Branch: refs/heads/master
Commit: f63bd7a21792a5dc2ba8544e1b6282fa6a3647eb
Parents: 7080f26
Author: Queenie Ma <qu...@gmail.com>
Authored: Mon Jan 9 09:34:31 2017 -0800
Committer: Queenie Ma <qu...@gmail.com>
Committed: Mon Jan 9 09:34:31 2017 -0800
----------------------------------------------------------------------
build.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/f63bd7a2/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index 9cabe81..eaefe98 100644
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,7 @@
set -e
cd site
jekyll build -d ../content_tmp
+# Remove dangling references to the DejaVu fonts in the Javadoc stylesheets
sed -i "" "/^@import/d; s/'DejaVu Sans',//g; s/'DejaVu Sans Mono',//g; s/'DejaVu Serif',//g" ../content_tmp/javadoc/*/stylesheet.css
COMMIT_HASH=`git rev-parse HEAD`
cd ..