Repository: incubator-hawq Updated Branches: refs/heads/2.2.0.0-incubating d70d7092f -> 18e928c91
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/18e928c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/18e928c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/18e928c9 Branch: refs/heads/2.2.0.0-incubating Commit: 18e928c91e36ec0bf6af7f9760fc8a7445537816 Parents: 4e6624a Author: shivzone <[email protected]> Authored: Wed Mar 29 18:15:37 2017 -0700 Committer: rlei <[email protected]> Committed: Sat Apr 1 12:02:48 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/18e928c9/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/18e928c9/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 ->
