This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new ecebd77 THRIFT-4716: add veralign.sh tool to set versions for releases
ecebd77 is described below
commit ecebd77c4a19919471345c21e797d55c5f83c22b
Author: James E. King III <jk...@apache.org>
AuthorDate: Fri Dec 28 08:50:58 2018 -0500
THRIFT-4716: add veralign.sh tool to set versions for releases
---
bower.json | 3 +-
configure.ac | 2 +-
.../Transports/Client/THttpClientTransport.cs | 2 +-
test/csharp/ThriftTest.csproj | 2 +-
veralign.sh | 313 +++++++++++++++++++++
5 files changed, 317 insertions(+), 5 deletions(-)
diff --git a/bower.json b/bower.json
index 436a2cf..853b8cb 100644
--- a/bower.json
+++ b/bower.json
@@ -11,6 +11,5 @@
"thrift"
],
"license": "Apache v2",
- "ignore": [
- ]
+ "ignore": []
}
diff --git a/configure.ac b/configure.ac
index fa50756..e04891f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ if test "$with_cpp" = "yes"; then
have_cpp="yes"
fi
- AX_LIB_EVENT([1.0])
+ AX_LIB_EVENT([2.0])
have_libevent=$success
AX_LIB_ZLIB([1.2.3])
diff --git a/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
b/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
index 6067141..797d380 100644
--- a/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
+++ b/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
@@ -149,7 +149,7 @@ namespace Thrift.Transports.Client
}
httpClient.DefaultRequestHeaders.Accept.Add(new
MediaTypeWithQualityHeaderValue("application/x-thrift"));
- httpClient.DefaultRequestHeaders.UserAgent.Add(new
ProductInfoHeaderValue("THttpClientTransport", "0.12.0"));
+ httpClient.DefaultRequestHeaders.UserAgent.Add(new
ProductInfoHeaderValue("THttpClientTransport", "1.0.0"));
if (CustomHeaders != null)
{
diff --git a/test/csharp/ThriftTest.csproj b/test/csharp/ThriftTest.csproj
index 363627f..63629eb 100644
--- a/test/csharp/ThriftTest.csproj
+++ b/test/csharp/ThriftTest.csproj
@@ -46,7 +46,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>0.12.0.%2a</ApplicationVersion>
+ <ApplicationVersion>1.0.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
diff --git a/veralign.sh b/veralign.sh
new file mode 100755
index 0000000..380aa48
--- /dev/null
+++ b/veralign.sh
@@ -0,0 +1,313 @@
+#!/usr/bin/env bash
+#
+# 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. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# The veralign script sets the appropriate versions in all of
+# the package configuration files for all of the supported
+# languages. It is used to prepare a release or move master
+# forward to the next anticipated version.
+#
+# USAGE
+# -----------------------------------------------------------
+# usage: veralign.sh <oldVersion> <newVersion>
+#
+# EXAMPLE
+# -----------------------------------------------------------
+# $ ./veralign.sh 0.12.0 1.0.0
+# $ ./veralign.sh 1.0.0 1.1.0
+#
+# IMPORTANT USAGE NOTE
+# -----------------------------------------------------------
+# Define the environment variable DRYRUN to have the script
+# print out all matches to the oldVersion hilighted so that
+# you can verify it will change the right things.
+#
+
+declare -A FILES
+
+# These files require a manual touch:
+FILES[CHANGES]=manual
+FILES[debian/changelog]=manual
+FILES[doap.rdf]=manual
+
+# These files can be updated automatically:
+FILES[ApacheThrift.nuspec]=simpleReplace
+FILES[Thrift-swift3.podspec]=simpleReplace
+FILES[Thrift.podspec]=simpleReplace
+FILES[appveyor.yml]=simpleReplace
+FILES[bower.json]=jsonReplace
+FILES[build/cmake/DefineCMakeDefaults.cmake]=simpleReplace
+FILES[configure.ac]=configureReplace
+FILES[contrib/thrift.spec]=simpleReplace
+FILES[lib/cocoa/src/Thrift.h]=simpleReplace
+FILES[lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj]=simpleReplace
+FILES[lib/csharp/src/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[lib/csharp/src/Thrift.csproj]=simpleReplace
+FILES[lib/csharp/test/Multiplex/Client/MultiplexClient.csproj]=simpleReplace
+FILES[lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[lib/csharp/test/Multiplex/Server/MultiplexServer.csproj]=simpleReplace
+FILES[lib/csharp/test/Multiplex/Server/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[lib/csharp/test/ThriftMVCTest/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[lib/d/src/thrift/base.d]=simpleReplace
+FILES[lib/dart/pubspec.yaml]=pubspecReplace
+FILES[lib/delphi/src/Thrift.pas]=simpleReplace
+FILES[lib/erl/src/thrift.app.src]=simpleReplace
+FILES[lib/haxe/haxelib.json]=simpleReplace
+FILES[lib/hs/thrift.cabal]=simpleReplace
+FILES[lib/java/gradle.properties]=simpleReplace
+FILES[lib/js/package.json]=jsonReplace
+FILES[lib/js/src/thrift.js]=simpleReplace
+FILES[lib/lua/Thrift.lua]=simpleReplace
+FILES[lib/netcore/Thrift/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs]=simpleReplace
+FILES[lib/ocaml/_oasis]=simpleReplace
+FILES[lib/perl/lib/Thrift.pm]=simpleReplace
+FILES[lib/py/setup.py]=simpleReplace
+FILES[lib/rb/thrift.gemspec]=simpleReplace
+FILES[lib/rs/Cargo.toml]=simpleReplace
+FILES[lib/st/package.xml]=simpleReplace
+FILES[package.json]=jsonReplace
+FILES[sonar-project.properties]=simpleReplace
+FILES[test/csharp/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[test/csharp/ThriftTest.csproj]=simpleReplace
+FILES[test/dart/test_client/pubspec.yaml]=pubspecReplace
+FILES[test/erl/src/thrift_test.app.src]=simpleReplace
+FILES[tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs]=simpleReplace
+FILES[tutorial/dart/client/pubspec.yaml]=pubspecReplace
+FILES[tutorial/dart/console_client/pubspec.yaml]=pubspecReplace
+FILES[tutorial/dart/server/pubspec.yaml]=pubspecReplace
+FILES[tutorial/delphi/DelphiClient/DelphiClient.dproj]=simpleReplace
+FILES[tutorial/delphi/DelphiServer/DelphiServer.dproj]=simpleReplace
+FILES[tutorial/hs/ThriftTutorial.cabal]=simpleReplace
+FILES[tutorial/ocaml/_oasis]=simpleReplace
+
+if [ ! -f "CHANGES" ]; then
+ >&2 echo "error: run veralign.sh while in the thrift root directory"
+ exit 1
+fi
+
+if [ $# -ne 2 ]; then
+ >&2 echo "usage: veralign.sh <oldVersion> <newVersion>"
+ exit 1
+fi
+
+jq --version 1>/dev/null 2>/dev/null
+if [ $? -ne 0 ]; then
+ >&2 echo "error: the 'jq' package is not installed"
+ exit 1
+fi
+
+#
+# validateVersion: check that a version matches the major.minor.patch
+# format which is the lowest common denominator supported by all
+# project systems.
+# \param $1 the version
+# \returns 0 if the version is compliant
+#
+function validateVersion
+{
+ local result
+ local valid
+ valid=$(echo "$1" | sed
'/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$/!{q22}')
+ result=$?
+ if [ $result -eq 22 ]; then
+ >&2 echo "error: version '$1' does not conform to the required
major.minor.patch format"
+ return ${result}
+ fi
+}
+
+OLDVERSION=$1
+NEWVERSION=$2
+validateVersion "${OLDVERSION}" || exit $?
+validateVersion "${NEWVERSION}" || exit $?
+
+#
+# escapeVersion: escape the version for use as a sed search
+# \param $1 the version to escape
+# \output the escaped string
+# \returns 0
+# \example VERSEARCH=$(escapeVersion "[1.0.0]"); echo $VERSEARCH; =>
"\[1\.0\.0\]"
+#
+function escapeVersion
+{
+ echo "$(echo $1 | sed 's/\./\\./g' | sed 's/\[/\\\[/g' | sed
's/\]/\\\]/g')"
+}
+
+# Set up verbose hilighting if running interactive
+if [ "$(tput colors)" -ne 0 ]; then
+ reverse=$(tput rev)
+ red=$(tput setaf 1)
+ green=$(tput setaf 2)
+ yellow=$(tput setaf 3)
+ normal=$(tput sgr0)
+fi
+
+declare -A MANUAL
+
+#
+# manual: note that update of said file is manual
+# \param $1 filename to do replacements on
+# \returns 0
+#
+function manual
+{
+ MANUAL["$1"]=""
+ return 0
+}
+
+#
+# configureReplace: replace the AC_INIT field in configure.ac
+# \param $1 filename to do replacements on
+# \returns 0 on success
+#
+
+function configureReplace
+{
+ replace "$1" "[thrift], [${OLDVERSION}]" "[thrift], [${NEWVERSION}]"
+}
+
+#
+# jsonReplace: replace a specific version field in a JSON file
+# must be a top level "version" field in the json structure
+# \param $1 filename to do replacements on
+# \returns 0 on success
+#
+
+function jsonReplace
+{
+ local result
+ local output
+ if [ ! -z "$DRYRUN" ]; then
+ output=$(jq -e ".version" "$1")
+ else
+ output=$(jq -e ".version = \"${NEWVERSION}\"" "$1" > tmp.$$.json && mv
tmp.$$.json "$1")
+ fi
+ result=$?
+ if [ $? -ne 0 ]; then
+ printf "%-60s | %5d | ${red}ERROR${normal}: version tag not found"
"$1" "$count"
+ echo
+ return 1
+ elif [ ! -z "$DRYRUN" ]; then
+ output=${output%\"}
+ output=${output#\"}
+ printf "%-60s | %5d | MATCHES: version:
\"${reverse}${green}${output}${normal}\"" "$1" 1
+ echo
+ return 0
+ fi
+ printf "%-60s | %5d | ${green}OK${normal}" "$1" 1
+ echo
+ return 0
+}
+
+#
+# pubspecReplace: replace a specific version field in a YAML file
+# must be a top level "version" field in the yaml structure
+# did not find a package that preserves comments so this is
+# somewhat brain-dead, but it gets the job done
+# \param $1 filename to do replacements on
+# \returns 0 on success
+#
+
+function pubspecReplace
+{
+ replace "$1" "version: ${OLDVERSION}" "version: ${NEWVERSION}"
+}
+
+#
+# replace: replace occurrences of one string with another
+# the file specified must contain the old string at least once
+# in order to be successful.
+# \param $1 filename to do replacements on
+# \param $2 the "old" string to be replaced
+# \param $3 the "new" striing to replace it with
+# \returns 0 on success
+#
+function replace
+{
+ local result
+ local output
+ local oldString="$2"
+ local newString="$3"
+ local oldRegex=$(escapeVersion "${oldString}")
+ local count=$(grep -Ec "${oldRegex}" "$1")
+ local verbose
+ if [ $count -eq 0 ]; then
+ printf "%-60s | %5d | ${red}NOT FOUND${normal}: ${oldString}" "$1" 0
+ echo
+ return 1
+ elif [ ! -z "$DRYRUN" ]; then
+ printf "%-60s | %5d | MATCHES:" "$1" "$count"
+ echo
+ while read -r line; do
+ echo " > $(echo "$line" | sed
"s/${oldRegex}/${reverse}${green}${oldString}${normal}/g")"
+ done < <(grep -E "${oldRegex}" "$1")
+ return 0
+ fi
+ output=$(sed -i "s/${oldRegex}/${newString}/g" "$1")
+ result=$?
+ if [ $result -ne 0 ]; then
+ printf "%-60s | %5d | ${red}ERROR${normal}: %s" "$1" "$count" "$output"
+ echo
+ return 1
+ fi
+ printf "%-60s | %5d | ${green}OK${normal}" "$1" "$count"
+ echo
+ return 0
+}
+
+#
+# simpleReplace: replace occurrences of ${OLDVERSION} with ${NEWVERSION}
+# the file specified must contain OLDVERSION at least once
+# in order to be successful.
+# \param $1 filename to do replacements on
+# \param $2 the "old" string to be replaced
+# \param $3 the "new" striing to replace it with
+# \returns 0 on success
+#
+function simpleReplace
+{
+ replace "$1" "${OLDVERSION}" "${NEWVERSION}"
+}
+
+echo ""
+echo "Apache Thrift Version Alignment Tool"
+echo "------------------------------------"
+echo ""
+echo "Previous Version: ${OLDVERSION}"
+echo " New Version: ${NEWVERSION}"
+echo ""
+echo
"-------------------------------------------------------------+-------+----------------------"
+echo "Filename | Count |
Status "
+echo
"-------------------------------------------------------------+-------+----------------------"
+
+for file in $(echo "${!FILES[@]}" | sort); do
+ ${FILES[$file]} $file || exit $?
+done
+
+echo
+echo "Files that must be modified manually:"
+echo
+for manu in $(echo "${!MANUAL[@]}" | sort); do
+ echo " > ${yellow}${manu}${normal}"
+done
+
+exit 0
