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/17 16:03:25 UTC
logging-log4cxx git commit: Wrong function definitions,
even though it worked.
Repository: logging-log4cxx
Updated Branches:
refs/heads/release_scripts 45195494d -> 3a9fb005f
Wrong function definitions, even though it worked.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3a9fb005
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3a9fb005
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3a9fb005
Branch: refs/heads/release_scripts
Commit: 3a9fb005f573487a15b082b7d12c460d6a6658eb
Parents: 4519549
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:03:23 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:03:23 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 12 ++++++------
releasePrepare.sh | 28 ++++++++++++++--------------
releasePurge.sh | 16 ++++++++--------
3 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3a9fb005/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index 635c605..bbc37cb 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -20,14 +20,14 @@
#
# Performing a release involves Maven currently to build and 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
+# the release archives anyway, which can be easily automated as well to not need to follow manual
# instructions always.
#
# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
# most likely prepared by the preparing counterpart.
#
-function main()
+function main
{
# log4cxx is able to build using private copies of apr and apr-util, which are expected in some
# special relative dir structure. That doesn't work with the default working dir "perform" uses,
@@ -45,14 +45,14 @@ function main()
publish_for_vote
}
-function perform_release()
+function perform_release
{
rm -rf "${WD_RELEASE}"
mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
}
# Prepare dist/dev to get the release candidate published for a vote.
-function prepare_dist_dev()
+function prepare_dist_dev
{
mkdir -p "${WD_DIST_DEV}"
pushd "${WD_DIST_DEV}" > /dev/null
@@ -63,7 +63,7 @@ function prepare_dist_dev()
svn up
}
-function sign_and_copy()
+function sign_and_copy
{
# Might be a good idea to have another look at the GPG plugin for Maven in the future:
#
@@ -87,7 +87,7 @@ function sign_and_copy()
done
}
-function publish_for_vote()
+function publish_for_vote
{
pushd "${WD_DIST_DEV}" > /dev/null
svn add --force *.*
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3a9fb005/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 0bbafe6..962fbec 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -18,7 +18,7 @@
##
# Prepare a release.
#
-# We need to update dates and version numbers at various places during releases and things can go
+# We need to update dates and version numbers at various places during releases and things can go
# wrong, so another RC might need to be released. Am not sure if/how those things are properly
# handled using the Maven release plugin, because that moves versions of the current branch forward
# and doesn't seem to provide a way to say that a new release is just another RC for some former
@@ -28,7 +28,7 @@
# So the current approach of this script is to always create a new branch "next_stable" which acts
# as the base for releases only. One needs to manually merge changes to the code into that branch
# as needed for making a release work, but keep all other changes to "master" etc. outside. We try
-# to handle setting release dates, current number of release candidate etc. here automatically as
+# to handle setting release dates, current number of release candidate etc. here automatically as
# much as possible. Some of that info is even merged back into some source branch, e.g. "master",
# because release dates in files like "src/changes/changes.xml" need to be updated with additional
# candidates or later releases.
@@ -43,7 +43,7 @@
# another release based on a former release, without merging things back to anywhere.
#
-function main()
+function main
{
#exit_on_changes
@@ -61,7 +61,7 @@ function main()
proc_new_release_cycle
}
-function exit_on_changes()
+function exit_on_changes
{
if [[ -n $(git status --short) || -n $(git diff-index HEAD) ]]
then
@@ -70,7 +70,7 @@ function exit_on_changes()
fi
}
-function co_next_stable()
+function co_next_stable
{
if [ -z "${branch_starting_is_ns}" ]
then
@@ -81,7 +81,7 @@ function co_next_stable()
fi
}
-function set_release_date_if()
+function set_release_date_if
{
local today=$(date "+%Y-%m-%d")
sed -i -r "1,/date=\".+?\"/ s/date=\".+?\"/date=\"${today}\"/" "src/changes/changes.xml"
@@ -100,7 +100,7 @@ function set_release_date_if()
fi
}
-function update_scm_tag_name_format()
+function update_scm_tag_name_format
{
local scm_tag_name_format=$(grep "<tagNameFormat>" "pom.xml")
local scm_tag_name_format_needs_one=$(echo "${scm_tag_name_format}" | grep -E -e "-RCx")
@@ -120,13 +120,13 @@ function update_scm_tag_name_format()
git commit -m "scm.tagNameFormat reconfigured to new RC number."
}
-function get_pom_curr_ver()
+function get_pom_curr_ver
{
# \t doesn't seem to work for grep for some reason.
echo "$(grep -E -e "^\s<version>" "pom.xml" | sed -r "s/^\t<.+>(.+)<.+>/\1/")"
}
-function get_mvn_prepare_new_dev_ver()
+function get_mvn_prepare_new_dev_ver
{
if [ -n "${branch_starting_is_ns}" ]
then
@@ -154,7 +154,7 @@ function get_mvn_prepare_new_dev_ver()
# @param[in] Original version from "pom.xml".
# @param[in] Specific version to be used by Maven.
#
-function revert_mvn_prepare_new_dev_ver()
+function revert_mvn_prepare_new_dev_ver
{
local pom_orig_ver="${1}"
local new_dev_ver="${2}"
@@ -163,7 +163,7 @@ function revert_mvn_prepare_new_dev_ver()
sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
}
-function exec_mvn()
+function exec_mvn
{
local pom_orig_ver="$(get_pom_curr_ver)"
local new_dev_ver="$( get_mvn_prepare_new_dev_ver)"
@@ -182,7 +182,7 @@ function exec_mvn()
exit 1
}
-function exit_on_started_with_ns()
+function exit_on_started_with_ns
{
if [ -n "${branch_starting_is_ns}" ]
then
@@ -190,7 +190,7 @@ function exit_on_started_with_ns()
fi
}
-function exit_on_no_new_release_cycle()
+function exit_on_no_new_release_cycle
{
git checkout "${branch_starting}"
local new_release_cycle=$(grep 'date="XXXX-XX-XX"' "src/changes/changes.xml")
@@ -202,7 +202,7 @@ function exit_on_no_new_release_cycle()
fi
}
-function proc_new_release_cycle()
+function proc_new_release_cycle
{
git checkout "${branch_starting}"
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3a9fb005/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index b501451..1abfcc8 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -22,7 +22,7 @@
# branches and tags created during tests of the release process. Be very careful with execution!
#
-function main()
+function main
{
purge_branch_and_tag
revert_pom
@@ -30,26 +30,26 @@ function main()
commit_reverts
}
-function purge_branch_and_tag()
+function purge_branch_and_tag
{
git checkout "release_scripts"
git branch -D "next_stable"
- git push --delete "origin" "next_stable"
+ git push --delete "origin" "next_stable"
for tag in $(git tag -l | grep "v0.11.0-RC")
- do
+ do
git tag --delete "${tag}"
git push --delete "origin" "${tag}"
done
}
-function revert_pom()
+function revert_pom
{
sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
}
-function revert_changes()
+function revert_changes
{
if [ -n "$(grep "version=\"0.11.1\"" "src/changes/changes.xml")" ]
then
@@ -58,7 +58,7 @@ function revert_changes()
sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
-
+
# Don't know how to remove the left newlines easier...
local changes=$(cat "src/changes/changes.xml")
echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
@@ -68,7 +68,7 @@ function revert_changes()
sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
}
-function commit_reverts()
+function commit_reverts
{
git add "pom.xml"
git add "src/changes/changes.xml"