Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A59ADDBC4 for ; Sat, 29 Sep 2012 21:04:55 +0000 (UTC) Received: (qmail 74466 invoked by uid 500); 29 Sep 2012 21:04:55 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 74433 invoked by uid 500); 29 Sep 2012 21:04:55 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 74426 invoked by uid 99); 29 Sep 2012 21:04:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Sep 2012 21:04:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Sep 2012 21:04:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5D51B238890D for ; Sat, 29 Sep 2012 21:04:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391880 - /hbase/branches/0.94/pom.xml Date: Sat, 29 Sep 2012 21:04:09 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120929210409.5D51B238890D@eris.apache.org> Author: stack Date: Sat Sep 29 21:04:08 2012 New Revision: 1391880 URL: http://svn.apache.org/viewvc?rev=1391880&view=rev Log: HBASE-4565 Maven HBase build broken on cygwin with copynativelib.sh call Modified: hbase/branches/0.94/pom.xml Modified: hbase/branches/0.94/pom.xml URL: http://svn.apache.org/viewvc/hbase/branches/0.94/pom.xml?rev=1391880&r1=1391879&r2=1391880&view=diff ============================================================================== --- hbase/branches/0.94/pom.xml (original) +++ hbase/branches/0.94/pom.xml Sat Sep 29 21:04:08 2012 @@ -871,8 +871,14 @@ - if [ `ls ${project.build.directory}/nativelib | wc -l` -ne 0 ]; then - cp -PR ${project.build.directory}/nativelib/lib* ${project.build.directory}/${project.build.finalName}/${project.build.finalName}/lib/native/${build.platform} + which cygpath 2> /dev/null + if [ $? = 1 ]; then + BUILD_DIR="${project.build.directory}" + else + BUILD_DIR=`cygpath --unix '${project.build.directory}'` + fi + if [ `ls $BUILD_DIR/nativelib | wc -l` -ne 0 ]; then + cp -PR $BUILD_DIR/nativelib/lib* $BUILD_DIR/${project.build.finalName}/${project.build.finalName}/lib/native/${build.platform} fi @@ -880,11 +886,19 @@ - - - - + + which cygpath 2> /dev/null + if [ $? = 1 ]; then + BUILD_DIR="${project.build.directory}" + else + BUILD_DIR=`cygpath --unix '${project.build.directory}'` + fi + + cd $BUILD_DIR/${project.build.finalName} + tar czf $BUILD_DIR/${project.build.finalName}.tar.gz ${project.build.finalName} + + + @@ -1448,6 +1462,17 @@ Mac_OS_X-${sun.arch.data.model} + + os.windows + + + Windows + + + + cygwin + +