[avro] branch branch-1.9 updated: AVRO-2505: `./build.sh clean` in the c++ directory doesn't remove all temporary files

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/branch-1.9 by this push:
     new 9543c7d  AVRO-2505: `./build.sh clean` in the c++ directory doesn't remove all temporary files
9543c7d is described below

commit 9543c7d4ca397361aa7cd71538bee7c9b62e4166
Author: Kengo Seki <se...@apache.org>
AuthorDate: Thu Aug 15 09:04:00 2019 +0900

    AVRO-2505: `./build.sh clean` in the c++ directory doesn't remove all temporary files
    
    (cherry picked from commit 4de6d838be56662b658e220deb2f1475685f768c)
---
 build.sh          |  5 +++--
 lang/c++/build.sh | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index c191ac2..42c7ed9 100755
--- a/build.sh
+++ b/build.sh
@@ -23,7 +23,7 @@ VERSION=`cat share/VERSION.txt`
 DOCKER_XTRA_ARGS=""
 
 function usage {
-  echo "Usage: $0 {test|dist|sign|clean|docker [--args \"docker-args\"]|rat|githooks|docker-test}"
+  echo "Usage: $0 {test|dist|sign|clean|veryclean|docker [--args \"docker-args\"]|rat|githooks|docker-test}"
   exit 1
 }
 
@@ -199,6 +199,7 @@ do
 
       (cd lang/perl; ./build.sh clean)
       ;;
+
     veryclean)
       rm -rf build dist
       (cd doc; ant clean)
@@ -232,8 +233,8 @@ do
       (cd lang/php; ./build.sh clean)
 
       (cd lang/perl; ./build.sh clean)
+
       rm -rf lang/c++/build
-      rm -rf lang/c++/test?.df
       rm -rf lang/js/node_modules
       rm -rf lang/perl/inc/
       rm -rf lang/ruby/.gem/
diff --git a/lang/c++/build.sh b/lang/c++/build.sh
index df2ec9e..bd1a0b8 100755
--- a/lang/c++/build.sh
+++ b/lang/c++/build.sh
@@ -44,10 +44,6 @@ DOC_CPP=$BUILD/$AVRO_DOC/api/cpp
 DIST_DIR=../../dist/cpp
 TARFILE=../dist/cpp/$AVRO_CPP.tar.gz
 
-(mkdir -p build; cd build; cmake -G "Unix Makefiles" ..)
-for target in "$@"
-do
-
 function do_doc() {
   doxygen
   if [ -d doc ]
@@ -58,6 +54,7 @@ function do_doc() {
     exit 1
   fi
 }
+
 function do_dist() {
   rm -rf $BUILD_CPP/
   mkdir -p $BUILD_CPP
@@ -74,6 +71,10 @@ function do_dist() {
   fi
 }
 
+(mkdir -p build; cd build; cmake -G "Unix Makefiles" ..)
+for target in "$@"
+do
+
 case "$target" in
   test)
     (cd build && cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug -D AVRO_ADD_PROTECTOR_FLAGS=1 .. && make && cd .. \
@@ -108,7 +109,7 @@ case "$target" in
 
   clean)
     (cd build && make clean)
-    rm -rf doc test.avro test6.df
+    rm -rf doc test.avro test?.df test_skip.df
     ;;
 
   install)