YETUS-326 ADDENDUM script changes to account for releasedocmaker lint options.
Signed-off-by: Andrew Wang <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/e3ea8a46 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/e3ea8a46 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/e3ea8a46 Branch: refs/heads/YETUS-379 Commit: e3ea8a46382265a36ea4712e74738352834faa34 Parents: 6002227 Author: Sean Busbey <[email protected]> Authored: Fri Apr 1 23:12:02 2016 -0500 Committer: Sean Busbey <[email protected]> Committed: Thu Apr 21 23:43:34 2016 -0500 ---------------------------------------------------------------------- asf-site-src/config.rb | 2 +- build.sh | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/e3ea8a46/asf-site-src/config.rb ---------------------------------------------------------------------- diff --git a/asf-site-src/config.rb b/asf-site-src/config.rb index 2b1fd27..1dd9814 100644 --- a/asf-site-src/config.rb +++ b/asf-site-src/config.rb @@ -95,7 +95,7 @@ def releasenotes(output, version) # file timestamp `(cd #{output} && #{RELEASEDOCMAKER} --project=YETUS --version=#{version} \ --projecttitle="Apache Yetus" \ - --usetoday --license --lint)` + --usetoday --license --lint=all)` unless $CHILD_STATUS.exitstatus == 0 abort("releasedocmaker failed to generate release notes for #{version}.") end http://git-wip-us.apache.org/repos/asf/yetus/blob/e3ea8a46/build.sh ---------------------------------------------------------------------- diff --git a/build.sh b/build.sh index 8be3911..9fecbec 100755 --- a/build.sh +++ b/build.sh @@ -88,7 +88,9 @@ mkdir -p target if [ "${offline}" != "true" ]; then JIRA_VERSION="${YETUS_VERSION%%-SNAPSHOT}" echo "generating release docs." - release-doc-maker/releasedocmaker.py --lint --license --outputdir target \ + # Note that we use the bare python here instead of the wrapper script, since we + # create said script. + release-doc-maker/releasedocmaker.py --lint=all --license --outputdir target \ --project YETUS "--version=${JIRA_VERSION}" \ --projecttitle="Apache Yetus" --usetoday mv "target/${JIRA_VERSION}/RELEASENOTES.${JIRA_VERSION}.md" target/RELEASENOTES.md @@ -170,7 +172,39 @@ cp -r precommit "${bin_tarball}/lib/" mkdir -p "${bin_tarball}/bin" -for utility in shelldocs/shelldocs.py release-doc-maker/releasedocmaker.py \ +# Make a special version of the shell wrapper for releasedocmaker +# that maintains the ability to have '--lint' mean '--lint=all' +cat >"${bin_tarball}/bin/releasedocmaker" <<EOF +#!/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. + +args=() +for arg in "\${@}"; do + if [ "\${arg}" = "-n" ] || [ "\${arg}" = "--lint" ]; then + args=("\${args[@]}" "--lint=all") + else + args=("\${args[@]}" "\${arg}") + fi +done + +exec "\$(dirname -- "\${BASH_SOURCE-0}")/../lib/release-doc-maker/releasedocmaker.py" "\${args[@]}" +EOF +chmod +x "${bin_tarball}/bin/releasedocmaker" + +for utility in shelldocs/shelldocs.py \ precommit/smart-apply-patch.sh precommit/test-patch.sh do wrapper=${utility##*/}
