Forward-port r43165 and r43168 from trunk-1.6.

  ------------------------------------------------------------------------
  r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines
  Changed paths:
     M /trunk-1.6/epan/Makefile.am
     M /trunk-1.6/wiretap/Makefile.am
     M /trunk-1.6/wsutil/Makefile.am
  
  Use separate commands in the dumpabi recipes instead a big huge long
  chain. If abi-compliance-checker fails print the contents of its
  log file.
  ------------------------------------------------------------------------
  r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines
  Changed paths:
     M /trunk-1.6/epan/Makefile.am
     M /trunk-1.6/wiretap/Makefile.am
     M /trunk-1.6/wsutil/Makefile.am
  
  Make sure ln happens in the right directory.
  ------------------------------------------------------------------------

We don't currently have a usable tag for "git describe --tags
--abbrev=0" to latch onto so just use the first 1.9 commit.

svn path=/trunk/; revision=43170

1 files changed, 14 insertions, 6 deletions

diff --git a/tools/git-compare-abis.sh b/tools/git-compare-abis.sh
index 15708264aa..337fe55d45 100755
--- a/tools/git-compare-abis.sh
+++ b/tools/git-compare-abis.sh
@@ -17,13 +17,21 @@ bash -c "$1"
 
 cd `git rev-parse --show-toplevel`
 # we are at top level
-LAST_TAG=`git describe --tags --abbrev=0`
-rm -rf $LAST_TAG
-mkdir $LAST_TAG
-git archive $LAST_TAG | tar -x -C $LAST_TAG
+
+# Stable branches with releases
+#LAST_TAG=`git describe --tags --abbrev=0`
+#LAST_TAG_DIR=$LAST_TAG
+
+# Unstable branches, e.g. master don't have usable tags. Use a commit instead.
+LAST_TAG=f1cf70fc10a09318e4a560dd9491f92d01f1c772
+LAST_TAG_DIR=master
+
+rm -rf $LAST_TAG_DIR
+mkdir $LAST_TAG_DIR
+git archive $LAST_TAG | tar -x -C $LAST_TAG_DIR
 
 # build latest tag
-(cd $LAST_TAG && bash -c "$1")
+(cd $LAST_TAG_DIR && bash -c "$1")
 
-exec tools/compare-abis.sh `pwd`/$LAST_TAG `pwd`
+exec tools/compare-abis.sh `pwd`/$LAST_TAG_DIR `pwd`