HBASE-2590 Failed parse of branch element in saveVersion.sh

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@947716 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-05-24 17:02:28 +00:00
parent f8ca192f92
commit 4ad80c69a5
2 changed files with 9 additions and 13 deletions

View File

@ -355,6 +355,8 @@ Release 0.21.0 - Unreleased
(Daniel Ploeg via Stack) (Daniel Ploeg via Stack)
HBASE-2589 TestHRegion.testWritesWhileScanning flaky on trunk HBASE-2589 TestHRegion.testWritesWhileScanning flaky on trunk
(Todd Lipcon via Stack) (Todd Lipcon via Stack)
HBASE-2590 Failed parse of branch element in saveVersion.sh
(Benoît Sigoure via Stack)
IMPROVEMENTS IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable HBASE-1760 Cleanup TODOs in HTable

View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
# This file is used to generate the annotation of package info that
# records the user, url, revision and timestamp.
# Licensed to the Apache Software Foundation (ASF) under one or more # Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with # contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. # this work for additional information regarding copyright ownership.
@ -15,12 +18,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is used to generate the annotation of package info that
# records the user, url, revision and timestamp.
# Copied from hadoop core r740386
unset LANG unset LANG
unset LC_CTYPE unset LC_CTYPE
version=$1 version=$1
@ -39,15 +36,12 @@ else
revision="Unknown" revision="Unknown"
url="file://$cwd" url="file://$cwd"
fi fi
mkdir -p $outputDirectory/org/apache/hadoop/hbase mkdir -p "$outputDirectory/org/apache/hadoop/hbase"
cat << EOF | \ cat >"$outputDirectory/org/apache/hadoop/hbase/package-info.java" <<EOF
sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
-e "s|URL|$url|" -e "s/REV/$revision/" \
> $outputDirectory/org/apache/hadoop/hbase/package-info.java
/* /*
* Generated by src/saveVersion.sh * Generated by src/saveVersion.sh
*/ */
@VersionAnnotation(version="VERSION", revision="REV", @VersionAnnotation(version="$version", revision="$revision",
user="USER", date="DATE", url="URL") user="$user", date="$date", url="$url")
package org.apache.hadoop.hbase; package org.apache.hadoop.hbase;
EOF EOF