You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2010/09/13 21:15:10 UTC
svn commit: r996648 - in /avro/branches/branch-1.4: ./ CHANGES.txt build.sh
lang/c++/build.sh lang/c/build.sh
Author: cutting
Date: Mon Sep 13 19:15:09 2010
New Revision: 996648
URL: http://svn.apache.org/viewvc?rev=996648&view=rev
Log:
Merge r996640,996642 from trunk to 1.4 branch. Fixes: AVRO-655, AVRO-657.
Modified:
avro/branches/branch-1.4/ (props changed)
avro/branches/branch-1.4/CHANGES.txt
avro/branches/branch-1.4/build.sh
avro/branches/branch-1.4/lang/c++/build.sh
avro/branches/branch-1.4/lang/c/build.sh
Propchange: avro/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 13 19:15:09 2010
@@ -1 +1 @@
-/avro/trunk:990852,990860,990867,990871,990878,991031,991423,992146,992149,992167
+/avro/trunk:990852,990860,990867,990871,990878,991031,991423,992146,992149,992167,996640,996642
Modified: avro/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/CHANGES.txt?rev=996648&r1=996647&r2=996648&view=diff
==============================================================================
--- avro/branches/branch-1.4/CHANGES.txt (original)
+++ avro/branches/branch-1.4/CHANGES.txt Mon Sep 13 19:15:09 2010
@@ -4,8 +4,14 @@ Avro 1.4.1 (unreleased)
IMPROVEMENTS
+ AVRO-655. Change build so that 'dist' target no longer also runs C
+ and C++ unit tests. (cutting)
+
BUG FIXES
+ AVRO-657. Fix build so that md5 and sha1 checksum files contain
+ only the file's basename without any directories. (cutting)
+
Avro 1.4.0 (31 August 2010)
INCOMPATIBLE CHANGES
Modified: avro/branches/branch-1.4/build.sh
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/build.sh?rev=996648&r1=996647&r2=996648&view=diff
==============================================================================
--- avro/branches/branch-1.4/build.sh (original)
+++ avro/branches/branch-1.4/build.sh Mon Sep 13 19:15:09 2010
@@ -108,10 +108,11 @@ case "$target" in
stty echo
for f in $(find dist -type f \
- \! -name '*.sha1' \! -name '*.asc' \! -name '*.txt' );
+ \! -name '*.md5' \! -name '*.sha1' \
+ \! -name '*.asc' \! -name '*.txt' );
do
- md5sum $f > $f.md5
- sha1sum $f > $f.sha1
+ (cd `dirname $f`; md5sum `basename $f`) > $f.md5
+ (cd `dirname $f`; sha1sum `basename $f`) > $f.sha1
gpg --passphrase $password --armor --output $f.asc --detach-sig $f
done
Modified: avro/branches/branch-1.4/lang/c++/build.sh
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/lang/c%2B%2B/build.sh?rev=996648&r1=996647&r2=996648&view=diff
==============================================================================
--- avro/branches/branch-1.4/lang/c++/build.sh (original)
+++ avro/branches/branch-1.4/lang/c++/build.sh Mon Sep 13 19:15:09 2010
@@ -77,7 +77,6 @@ function do_configure {
}
function do_build {
- (cd $build_dir && make)
(cd $build_dir && make check)
}
@@ -100,10 +99,8 @@ function do_tar_file {
}
function do_dist {
- (cd $build_dir && make)
- (cd $build_dir && make check)
- do_docs
do_tar_file
+ do_docs
}
function do_clean {
Modified: avro/branches/branch-1.4/lang/c/build.sh
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/lang/c/build.sh?rev=996648&r1=996647&r2=996648&view=diff
==============================================================================
--- avro/branches/branch-1.4/lang/c/build.sh (original)
+++ avro/branches/branch-1.4/lang/c/build.sh Mon Sep 13 19:15:09 2010
@@ -51,7 +51,7 @@ case "$1" in
dist)
prepare_build
- make -C $build_dir distcheck
+ make -C $build_dir dist
if [ ! -d $dist_dir ]; then
mkdir -p $dist_dir
fi