You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2017/08/15 08:45:31 UTC
logging-log4cxx git commit: Some docs added and spelling errors fixed.
Repository: logging-log4cxx
Updated Branches:
refs/heads/master feb0768fc -> 0688c575f
Some docs added and spelling errors fixed.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/0688c575
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/0688c575
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/0688c575
Branch: refs/heads/master
Commit: 0688c575ffee634c9b14c443f4125b47248428e4
Parents: feb0768
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 10:45:29 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 10:45:29 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 13 ++++++++++---
releasePrepare.sh | 10 ++++++++--
2 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/0688c575/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index 462d304..e1d7a01 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -14,7 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Sign release artifacts until a better solution is available.
+
+##
+# Perform a release.
+#
+# Performing a release involves Maven currently to build an test things and we
+# ran into problems with the default dir structure maven assumes. This script
+# works around those and we need to sign the release archives anyway, which can
+# be easily automated as well to not need to follow manual instructions always.
#
# log4cxx is able to build using private copies of apr and apr-util, which are
@@ -40,7 +47,7 @@ then
fi
svn up
-# Might be a good idea to have another look at the GBG plugin for Maven in the
+# Might be a good idea to have another look at the GPG plugin for Maven in the
# future:
#
# http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
@@ -54,7 +61,7 @@ do
md5sum "${file}" > "${file}.md5"
sha512sum "${file}" > "${file}.sha"
- # No symlinks because those would be treated as as, no hardlinks because it
+ # No symlinks because those would be treated as is, no hardlinks because it
# should be safer for commits.
cp --force "${file}" "${WD_DIST_DEV}"
cp --force "${file}.asc" "${WD_DIST_DEV}"
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/0688c575/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 0875a0f..74554b4 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -14,8 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+##
# Prepare a release.
#
+# We need to update dates and version numbers at various places during releases
+# and quite a lot of the needed changes are possible in this script, so that is
+# preferred over manually following some docs in the wiki.
+#
TODAY=$(date "+%Y-%m-%d")
sed -i -r "s/date=\"XXXX-XX-XX\"/date=\"${TODAY}\"/" "src/changes/changes.xml"
@@ -25,7 +31,7 @@ git diff-index --quiet HEAD || git commit -m "Set release date to today."
mvn clean
mvn release:prepare -Dresume=false
-# Propagate new version in some additional files:
+# Propagate new version into some additional files:
NEW_DEV_VER_SHORT=$(grep -E "^project.dev.log4cxx" "release.properties" | cut -d = -f 2 | cut -d - -f 1)
NEW_RELEASE=$(cat <<-"END"
<body>\n\
@@ -42,4 +48,4 @@ sed -i -r "s/<body>/${NEW_RELEASE}/" "src/changes/changes.xml"
git add "configure.ac"
git add "src/changes/changes.xml"
-git diff-index --quiet HEAD || git commit -m "prepare for next development iteration: ${NEW_DEV_VER_SHORT}"
+git diff-index --quiet HEAD || git commit -m "Prepare for next development iteration: ${NEW_DEV_VER_SHORT}"