You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2021/12/01 10:51:06 UTC
[incubator-ponymail-foal] branch master updated (a593d2e -> 94aa959)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from a593d2e Also check JS version
new 298d081 Drop unused header fields
new 94aa959 Only include actual source JS versions in revision
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:
tools/archiver.py | 4 ----
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 3 +--
webui/js/source/build.sh | 36 ++++++++++++++++++++++++++++--------
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
8 files changed, 48 insertions(+), 33 deletions(-)
[incubator-ponymail-foal] 02/02: Only include actual source JS versions in revision
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 94aa959c8eda2705eb2d83e4a1d60086fe29c84f
Author: Sebb <se...@apache.org>
AuthorDate: Wed Dec 1 10:50:07 2021 +0000
Only include actual source JS versions in revision
Exclude ponymail.js to avoid need to commit it before updating html
Process is now:
- update js
- commit, no push
- run build.sh
- commit and push
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 3 +--
webui/js/source/build.sh | 36 ++++++++++++++++++++++++++++--------
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
7 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 20f80d5..112b385 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=fbc70b4" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=fbc70b4"></script>
- <script src="js/wordcloud.js?revision=fbc70b4"></script>
- <script src="js/ponymail.js?revision=fbc70b4"></script>
+ <script src="js/config.js?revision=ae9032f"></script>
+ <script src="js/wordcloud.js?revision=ae9032f"></script>
+ <script src="js/ponymail.js?revision=ae9032f"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
diff --git a/webui/index.html b/webui/index.html
index 07b5e24..f695c61 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=fbc70b4" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -60,8 +60,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=fbc70b4"></script>
- <script src="js/ponymail.js?revision=fbc70b4"></script>
+ <script src="js/config.js?revision=ae9032f"></script>
+ <script src="js/ponymail.js?revision=ae9032f"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 2e60291..e99ab14 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,8 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = "45e3830";
-
+const PONYMAIL_REVISION = 'ae9032f';
/******************************************
diff --git a/webui/js/source/build.sh b/webui/js/source/build.sh
index afb75d9..834481e 100755
--- a/webui/js/source/build.sh
+++ b/webui/js/source/build.sh
@@ -5,14 +5,33 @@ cd $(dirname "$0") || exit 1
test -r build.sh || { echo "Must be run from the directory containing build.sh!"; exit 1; }
+git diff --exit-code -- *.js || echo "Please commit source changes before updating ponymail.js!"
+
# Javascript revision (for updating HTML)
-JS_REV=$(git log -1 --pretty=%h -- ..)
+# Need to include the ponymail sources here, but not ponymail.js itself
+JS_REV=$({
+ for f in *.js ../*.js
+ do
+ if [ "$f" != '../ponymail.js' ]
+ then
+ git log -1 --pretty='%ct %h' -- $f
+ fi
+ done
+} | sort -r | head -1 | cut -d' ' -f 2)
# Javascript source revision (for creating ponymail.js)
-JS_SRC_REV=$(git log -1 --pretty=%h -- .)
+# Only check ponymail sources here
+JS_SRC_REV=$({
+ for f in *.js
+ do
+ git log -1 --pretty='%ct %h' -- $f
+ done
+} | sort -r | head -1 | cut -d' ' -f 2)
echo "Combining JS..."
-echo '/*
+{
+cat <<EOD
+/*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -30,16 +49,17 @@ echo '/*
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = "'$JS_SRC_REV'";
-' > ../ponymail.js
+const PONYMAIL_REVISION = '$JS_SRC_REV';
+EOD
+
for f in `ls *.js`; do
- printf "\n\n/******************************************\n Fetched from source/${f}\n******************************************/\n\n" >> ../ponymail.js
- perl -0pe 's/\/\*.*?\*\/[\r\n]*//sm' ${f} >> ../ponymail.js
+ printf "\n\n/******************************************\n Fetched from source/${f}\n******************************************/\n\n"
+ perl -0pe 's/\/\*.*?\*\/[\r\n]*//sm' ${f}
done
+} > ../ponymail.js
# Adjust JS caches in .html
for f in `ls ../../*.html`; do
- echo ${f}
perl -0pe 's/\?revision=[a-f0-9]+/?revision='${JS_REV}'/smg' ${f} > ${f}.tmp && mv ${f}.tmp ${f}
done
diff --git a/webui/list.html b/webui/list.html
index 0c46394..54e9da4 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=fbc70b4" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -173,9 +173,9 @@ the License. -->
</script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=fbc70b4"></script>
- <script src="js/wordcloud.js?revision=fbc70b4"></script>
- <script src="js/ponymail.js?revision=fbc70b4"></script>
+ <script src="js/config.js?revision=ae9032f"></script>
+ <script src="js/wordcloud.js?revision=ae9032f"></script>
+ <script src="js/ponymail.js?revision=ae9032f"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
<script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index a0a8c6e..ed2d789 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=fbc70b4" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=fbc70b4"></script>
- <script src="js/ponymail.js?revision=fbc70b4"></script>
- <script src="js/oauth.js?revision=fbc70b4"></script>
+ <script src="js/config.js?revision=ae9032f"></script>
+ <script src="js/ponymail.js?revision=ae9032f"></script>
+ <script src="js/oauth.js?revision=ae9032f"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 0ac1f5d..71b08aa 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=fbc70b4" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=fbc70b4"></script>
- <script src="js/wordcloud.js?revision=fbc70b4"></script>
- <script src="js/ponymail.js?revision=fbc70b4"></script>
+ <script src="js/config.js?revision=ae9032f"></script>
+ <script src="js/wordcloud.js?revision=ae9032f"></script>
+ <script src="js/ponymail.js?revision=ae9032f"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
[incubator-ponymail-foal] 01/02: Drop unused header fields
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 298d081b93ff828f9599971dc69d634195b9da19
Author: Sebb <se...@apache.org>
AuthorDate: Wed Dec 1 00:01:07 2021 +0000
Drop unused header fields
---
tools/archiver.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tools/archiver.py b/tools/archiver.py
index dc411f0..f8cd707 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -362,10 +362,6 @@ class Archiver(object): # N.B. Also used by import-mbox.py
"message-id",
"subject",
"references",
- # The following don't appear to be needed currently
- "x-message-id-hash",
- "x-mailman-rule-hits",
- "x-mailman-rule-misses",
]
# keys that need to be decoded
HDR_KEYS_DECODE = ["to", "from", "subject", "message-id"]