Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hawq.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: shivram@apache.org
To: commits@hawq.incubator.apache.org
Message-Id: <a11dd934678f4b49b7326873e1ee69f0@git.apache.org>
Subject: incubator-hawq git commit: HAWQ-1535. Link PXF Library during install
Date: Fri,  6 Oct 2017 20:21:38 +0000 (UTC)
archived-at: Fri, 06 Oct 2017 20:21:43 -0000

Repository: incubator-hawq
Updated Branches:
  refs/heads/master c00b8d3ff -> 0fca19d0a


HAWQ-1535. Link PXF Library during install


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/0fca19d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/0fca19d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/0fca19d0

Branch: refs/heads/master
Commit: 0fca19d0a43e8519d8970ff63bbb4291038263ca
Parents: c00b8d3
Author: shivzone <shivram.mani@gmail.com>
Authored: Fri Oct 6 13:21:32 2017 -0700
Committer: shivzone <shivram.mani@gmail.com>
Committed: Fri Oct 6 13:21:32 2017 -0700

----------------------------------------------------------------------
 pxf/Makefile                                            | 12 ++++++++++--
 pxf/build.gradle                                        |  2 +-
 .../configs/templates/pxf-private.classpath.template    | 12 ++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0fca19d0/pxf/Makefile
----------------------------------------------------------------------
diff --git a/pxf/Makefile b/pxf/Makefile
index 3ac38b1..bd2b939 100644
--- a/pxf/Makefile
+++ b/pxf/Makefile
@@ -22,11 +22,13 @@ ifneq "$(HD)" ""
     BUILD_PARAMS= -Dhd=$(HD)
 else
     ifneq "$(PXF_HOME)" ""
-        BUILD_PARAMS= -DdeployPath=$(PXF_HOME)
+        BUILD_PARAMS= -DdeployPath="$(PXF_HOME)"
     else ifneq "$(GPHOME)" ""
-        BUILD_PARAMS= -DdeployPath="$(GPHOME)/pxf"
+        PXF_HOME= "$(GPHOME)/pxf"
+        BUILD_PARAMS= -DdeployPath="$(PXF_HOME)"
     else
 		@echo "Cannot invoke install without configuring either PXF_HOME or GPHOME"
+		exit
     endif
 endif
 
@@ -92,6 +94,12 @@ tomcat:
 
 install:
 	./gradlew install $(BUILD_PARAMS)
+	@if [ -d "$(PXF_HOME)/lib" ] ; then \
+		pushd $(PXF_HOME)/lib && \
+		for X in pxf-*-[0-9]*.jar; do \
+			ln -sf $$X `echo $$X | sed -e 's/-[a-zA-Z0-9.]*.jar/.jar/'`; \
+		done && popd; \
+	fi
 
 bundle:
 	./gradlew bundle $(BUILD_PARAMS)

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0fca19d0/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index e27074e..e47aa6e 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -614,7 +614,7 @@ def pxfTargetDir = System.properties['deployPath'] ?: "build/"
 
 task install(type: Copy, dependsOn: [subprojects.build, tomcatGet]) {
     into "${pxfTargetDir}"
-    subprojects { subProject ->
+    subprojects { project ->
         from("${project.name}/build/libs") { into 'lib' }
     }
     from("pxf-service/src/scripts/pxf-service") {

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0fca19d0/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template b/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
index d5d1910..c7d9b47 100644
--- a/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
+++ b/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
@@ -23,11 +23,11 @@
 PXF_HOME/conf
 
 # PXF Libraries
-PXF_HOME/lib/pxf-hbase-*[0-9].jar
-PXF_HOME/lib/pxf-hdfs-*[0-9].jar
-PXF_HOME/lib/pxf-hive-*[0-9].jar
-PXF_HOME/lib/pxf-json-*[0-9].jar
-PXF_HOME/lib/pxf-jdbc-*[0-9].jar
+PXF_HOME/lib/pxf-hbase.jar
+PXF_HOME/lib/pxf-hdfs.jar
+PXF_HOME/lib/pxf-hive.jar
+PXF_HOME/lib/pxf-json.jar
+PXF_HOME/lib/pxf-jdbc.jar
 
 # Hadoop/Hive/HBase configurations
 HADOOP_HOME/etc/hadoop
@@ -77,4 +77,4 @@ HBASE_HOME/lib/hbase-common*.jar
 HBASE_HOME/lib/hbase-protocol*.jar
 HBASE_HOME/lib/htrace-core*.jar
 HBASE_HOME/lib/netty*.jar
-HBASE_HOME/lib/zookeeper*.jar
\ No newline at end of file
+HBASE_HOME/lib/zookeeper*.jar