You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2020/10/23 19:22:00 UTC
[openoffice-org] branch main updated (0df5783 -> 878f7f6)
This is an automated email from the ASF dual-hosted git repository.
wave pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git.
from 0df5783 starting to test bake
new 829946f build scripts at top level. first pass at properties file. templates are next.
new 878f7f6 footer and doctype are no longer templated. they are now constant html.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assets/doctype.html | 1 +
{templates => assets}/footer.html | 2 +-
bake.sh | 10 ++++++++++
build_local.sh | 10 ++++++++++
build_site.sh | 23 +++++++++++++++++++++++
content/doctype.md | 1 -
content/footer.md | 1 -
jbake.properties | 22 ++++++++++++++++++++++
templates/doctype.html | 1 -
9 files changed, 67 insertions(+), 4 deletions(-)
create mode 100644 assets/doctype.html
rename {templates => assets}/footer.html (97%)
create mode 100755 bake.sh
create mode 100755 build_local.sh
create mode 100755 build_site.sh
delete mode 100644 content/doctype.md
delete mode 100644 content/footer.md
create mode 100644 jbake.properties
delete mode 100644 templates/doctype.html
[openoffice-org] 01/02: build scripts at top level. first pass at
properties file. templates are next.
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
commit 829946fc5cf2054de0cc7b219adcf4d4d24a2508
Author: Dave Fisher <da...@davefisher.tech>
AuthorDate: Fri Oct 23 12:07:59 2020 -0700
build scripts at top level. first pass at properties file. templates are next.
---
bake.sh | 10 ++++++++++
build_local.sh | 10 ++++++++++
build_site.sh | 23 +++++++++++++++++++++++
jbake.properties | 22 ++++++++++++++++++++++
4 files changed, 65 insertions(+)
diff --git a/bake.sh b/bake.sh
new file mode 100755
index 0000000..b781bc6
--- /dev/null
+++ b/bake.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -z ${JBAKE_HOME} ]
+then
+ echo "Missing JBAKE_HOME variable" >&2
+ exit 1
+fi
+
+export JBAKE_OPTS="-Djavax.xml.accessExternalDTD=http"
+${JBAKE_HOME}/bin/jbake $@
diff --git a/build_local.sh b/build_local.sh
new file mode 100755
index 0000000..f95016a
--- /dev/null
+++ b/build_local.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CURRENTDIR=`pwd`
+WORKDIR=/tmp/ooo-site
+
+rm -rf $WORKDIR
+mkdir -p $WORKDIR
+
+# just bake and serve the site
+./bake.sh -b -s . $WORKDIR
diff --git a/build_site.sh b/build_site.sh
new file mode 100755
index 0000000..2f7449d
--- /dev/null
+++ b/build_site.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+CURRENTDIR=`pwd`
+WORKDIR=/tmp/ooo-site
+ME=`basename $0`
+
+rm -rf $WORKDIR
+mkdir -p $WORKDIR
+
+# now bake the site
+./bake.sh -b . $WORKDIR
+
+# push all of the results to asf-site
+git checkout asf-site
+git clean -f -d
+git pull origin asf-site
+rm -rf content
+mkdir content
+cp -a $WORKDIR/* content
+cp -a $WORKDIR/.htaccess content
+git add content
+git commit -m "git-site-role commit from $ME"
+git push origin asf-site
diff --git a/jbake.properties b/jbake.properties
new file mode 100644
index 0000000..fa4618d
--- /dev/null
+++ b/jbake.properties
@@ -0,0 +1,22 @@
+#site.host=https://www.openofffice.org
+site.host=http://localhost:8820
+render.tags=false
+render.sitemap=false
+template.homepage.file=homepage.gsp
+template.projectspage.file=projectspage.gsp
+template.simplepage.file=simplepage.gsp
+template.retired.file=retired.gsp
+template.archive.file=archive.gsp
+template.tag.file=tags.gsp
+template.sitemap.file=sitemap.gsp
+template.post.file=post.gsp
+template.page.file=page.gsp
+template.feed.file=feed.gsp
+template.guide.file=guide.gsp
+template.proposalGuide.file=guide.gsp
+template.pmcGuide.file=guide.gsp
+template.policy.file=policy.gsp
+render.index=false
+index.file=index.html
+content.folder=content
+destination.folder=output
[openoffice-org] 02/02: footer and doctype are no longer templated.
they are now constant html.
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
commit 878f7f6a51bda54f379f7f98d280291cffc97c95
Author: Dave Fisher <da...@davefisher.tech>
AuthorDate: Fri Oct 23 12:21:27 2020 -0700
footer and doctype are no longer templated. they are now constant html.
---
assets/doctype.html | 1 +
{templates => assets}/footer.html | 2 +-
content/doctype.md | 1 -
content/footer.md | 1 -
templates/doctype.html | 1 -
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/assets/doctype.html b/assets/doctype.html
new file mode 100644
index 0000000..0e76edd
--- /dev/null
+++ b/assets/doctype.html
@@ -0,0 +1 @@
+<!DOCTYPE html>
diff --git a/templates/footer.html b/assets/footer.html
similarity index 97%
rename from templates/footer.html
rename to assets/footer.html
index f3b1866..a6dbea9 100644
--- a/templates/footer.html
+++ b/assets/footer.html
@@ -1,4 +1,4 @@
- <div id="{{ headers.divid }}">
+ <div id="footera">
<div id="asfbanner">
<p><a href="https://www.apache.org/events/current-event.html"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Events" height="60" width="234" /></a></p>
</div>
diff --git a/content/doctype.md b/content/doctype.md
deleted file mode 100644
index 91639f8..0000000
--- a/content/doctype.md
+++ /dev/null
@@ -1 +0,0 @@
-doctype: html
\ No newline at end of file
diff --git a/content/footer.md b/content/footer.md
deleted file mode 100644
index 61466ac..0000000
--- a/content/footer.md
+++ /dev/null
@@ -1 +0,0 @@
-divid: footera
diff --git a/templates/doctype.html b/templates/doctype.html
deleted file mode 100644
index 7b88be0..0000000
--- a/templates/doctype.html
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE {{ headers.doctype }}>