You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2017/04/01 04:00:52 UTC
incubator-hawq git commit: HAWQ-1421. PXF rpm updates to make it oss
friendly
Repository: incubator-hawq
Updated Branches:
refs/heads/master 843561d84 -> be0547200
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/be054720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/be054720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/be054720
Branch: refs/heads/master
Commit: be0547200298e6d1a42e65d7c7e951b18d249dbd
Parents: 843561d
Author: shivzone <sh...@gmail.com>
Authored: Wed Mar 29 18:15:37 2017 -0700
Committer: rlei <rl...@pivotal.io>
Committed: Sat Apr 1 12:00:09 2017 +0800
----------------------------------------------------------------------
pxf/Makefile | 2 +-
pxf/build.gradle | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/be054720/pxf/Makefile
----------------------------------------------------------------------
diff --git a/pxf/Makefile b/pxf/Makefile
index 2959f9c..7405878 100644
--- a/pxf/Makefile
+++ b/pxf/Makefile
@@ -47,7 +47,7 @@ help:
@echo "help it is then"
@echo "Possible targets"
@echo " - all (clean, build, unittest, jar, tar, rpm)"
- @echo " - - HD=<phd|hdp> - set classpath to match hadoop distribution. default phd"
+ @echo " - - HD=<hdp> - set classpath to match hadoop distribution. default will be apache hadoop compliant"
@echo " - - LICENSE=<license info> - add license info to created RPMs"
@echo " - - VENDOR=<vendor name> - add vendor name to created RPMs"
@echo " - - PLUGINS_EXCLUDE_RPM=plugin1, plugin2,... - do not build and RPM for given comma-separated list of plugins"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/be054720/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index e9d04af..802b1e4 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -41,17 +41,22 @@ buildscript {
}
}
-// Hadoop distribution (can be phd or hdp) - needed to set correct classpaths
+// Hadoop distribution (can be hdp or null which would default to apache) - needed to set correct classpaths
// can be set with -Dhd=<value>
-def hddist = System.properties['hd'] ?: 'hdp';
-if (hddist != 'phd' && hddist != 'hdp') {
+def hddist = System.properties['hd'] ?: '';
+if (hddist != 'hdp' && hddist != '') {
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 ->