incubator-hawq git commit: HAWQ-1421. PXF rpm updates to make it oss friendly

[sh...@apache.org]

Repository: incubator-hawq
Updated Branches:
  refs/heads/HAWQ-1421 [created] e0102a821


HAWQ-1421. PXF rpm updates to make it oss friendly


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

Branch: refs/heads/HAWQ-1421
Commit: e0102a821204c72c8f4cfe99562b8d27fb4cf967
Parents: 2761edb
Author: shivzone <sh...@gmail.com>
Authored: Wed Mar 29 18:15:37 2017 -0700
Committer: shivzone <sh...@gmail.com>
Committed: Wed Mar 29 18:15:37 2017 -0700

----------------------------------------------------------------------
 pxf/build.gradle | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e0102a82/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index e9d04af..99ad5bb 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -43,15 +43,20 @@ buildscript {
 
 // Hadoop distribution (can be phd or hdp) - needed to set correct classpaths
 // can be set with -Dhd=<value>
-def hddist = System.properties['hd'] ?: 'hdp';
-if (hddist != 'phd' && hddist != 'hdp') {
-    throw new GradleException("hadoop distribution parameter (hd) set to invalid value: $hddist")
-}
+def hddist = System.properties['hd'] ?: '';
+//if (hddist != 'phd' && hddist != 'hdp') {
+//    throw new GradleException("hadoop distribution parameter (hd) set to invalid value: $hddist")
+//}
 
 // Some package names need to be renamed to include the version number
 // as part of the package name to enable side by side install of two versions of the same package.
+
 def versionedPackageName(packageName) {
-    packageName + "_" + "${version}".replace(".", "_")
+    if (System.properties['hd'] == 'hdp') {
+        packageName + "_" + "${version}".replace(".", "_")
+    } else {
+        packageName
+    }
 }
 
 subprojects { subProject ->