Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 51040200B6B for ; Wed, 10 Aug 2016 23:50:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4FE3E160A8F; Wed, 10 Aug 2016 21:50:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9FA68160AA4 for ; Wed, 10 Aug 2016 23:50:12 +0200 (CEST) Received: (qmail 772 invoked by uid 500); 10 Aug 2016 21:50:11 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 746 invoked by uid 99); 10 Aug 2016 21:50:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Aug 2016 21:50:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B549BE055E; Wed, 10 Aug 2016 21:50:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Wed, 10 Aug 2016 21:50:12 -0000 Message-Id: <19a57c0649644e72ac73a9b312bf3605@git.apache.org> In-Reply-To: <17e41f8198154aa4b31f5d4818b6c916@git.apache.org> References: <17e41f8198154aa4b31f5d4818b6c916@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/10] accumulo git commit: ACCUMULO-4399 Escape OUTPUT_DIR target in Makefile archived-at: Wed, 10 Aug 2016 21:50:13 -0000 ACCUMULO-4399 Escape OUTPUT_DIR target in Makefile Escape spaces and parens in the OUTPUT_DIR make parameter when set. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bd3306f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bd3306f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bd3306f Branch: refs/heads/1.7 Commit: 9bd3306f03fbd6b910e54df4e8e4834e2ee89a81 Parents: fc9bd07 Author: Christopher Tubbs Authored: Wed Aug 10 17:48:07 2016 -0400 Committer: Christopher Tubbs Committed: Wed Aug 10 17:48:07 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9bd3306f/server/native/src/main/resources/Makefile ---------------------------------------------------------------------- diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile index 1e26303..5434356 100644 --- a/server/native/src/main/resources/Makefile +++ b/server/native/src/main/resources/Makefile @@ -20,6 +20,10 @@ CXX=g++ MAVERICKFLAGS= USERFLAGS=$(shell env | grep "^USERFLAGS=" | cut -d= -f2) +ifneq (,$(OUTPUT_DIR)) + OUTPUT_DIR_ESCAPED=$(shell echo '$(OUTPUT_DIR)' | sed 's/ /\\ /g' | sed 's/\([()]\)/\\\1/g') +endif + ifeq ($(shell uname),Linux) JAVA_HOME=$(shell env | grep "^JAVA_HOME=" | cut -d= -f2) ifeq ($(strip $(JAVA_HOME)),) @@ -57,7 +61,7 @@ test : $(NATIVE_LIB) testJavaHome runTests testJavaHome : @echo 'JAVA_HOME is $(JAVA_HOME)' -runTests : $(NATIVE_LIB) $(TESTSRCS) $(OUTPUT_DIR) +runTests : $(NATIVE_LIB) $(TESTSRCS) $(OUTPUT_DIR_ESCAPED) $(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -I'$(JAVA_HOME)'/include/darwin -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB) $(MAVERICK_FLAGS) LD_LIBRARY_PATH=./ ./$@ 20 20 20 20 20 20 20 20 true if [ ! -z "$(OUTPUT_DIR)" ]; then cp '$(NATIVE_LIB)' "$(OUTPUT_DIR)"; fi