You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by nh...@apache.org on 2016/01/06 01:33:47 UTC
incubator-hawq git commit: HAWQ-103. Build PXF RPMs with license and
vendor parameters
Repository: incubator-hawq
Updated Branches:
refs/heads/master 33c72cd1e -> 6cff1b57a
HAWQ-103. Build PXF RPMs with license and vendor parameters
By default, license is ASL 2.0 and vendor is Apache HAWQ Incubating.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/6cff1b57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/6cff1b57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/6cff1b57
Branch: refs/heads/master
Commit: 6cff1b57aded860e5bb55efe6a0a9e9e4ab44a2d
Parents: 33c72cd
Author: Noa Horn <nh...@pivotal.io>
Authored: Tue Jan 5 16:33:17 2016 -0800
Committer: Noa Horn <nh...@pivotal.io>
Committed: Tue Jan 5 16:33:17 2016 -0800
----------------------------------------------------------------------
pxf/Makefile | 12 +++++++++++-
pxf/build.gradle | 8 ++++----
pxf/gradle.properties | 2 ++
3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6cff1b57/pxf/Makefile
----------------------------------------------------------------------
diff --git a/pxf/Makefile b/pxf/Makefile
index c5248f4..77ea4d7 100644
--- a/pxf/Makefile
+++ b/pxf/Makefile
@@ -5,13 +5,23 @@ ifneq "$(HD)" ""
BUILD_PARAMS= -Dhd=$(HD)
endif
+ifneq "$(LICENSE)" ""
+BUILD_PARAMS+= -Plicense="$(LICENSE)"
+endif
+ifneq "$(VENDOR)" ""
+BUILD_PARAMS+= -Pvendor="$(VENDOR)"
+endif
+
help:
@echo
@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 " - - LICENSE=<license info> - add license info to created RPMs"
+ @echo " - - VENDOR=<vendor name> - add vendor name to created RPMs"
@echo " - tomcat - builds tomcat rpm from downloaded tarball"
+ @echo " - - LICENSE and VENDOR parameters can be used as well"
all:
./gradlew clean release $(BUILD_PARAMS)
@@ -33,5 +43,5 @@ clean:
.PHONY: tomcat
tomcat:
- ./gradlew tomcatRpm
+ ./gradlew tomcatRpm $(BUILD_PARAMS)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6cff1b57/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index 8e82e3c..0d260d4 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -110,11 +110,11 @@ subprojects { subProject ->
//buildRpm
ospackage {
summary = 'The PXF extensions library for HAWQ'
- vendor = 'Pivotal'
+ vendor = project.vendor
release = buildNumber()
version = subProject.version.split('-')[0];
os = LINUX
- license = "ASL 2.0"
+ license = project.license
obsoletes('gpxf')
user = 'root'
permissionGroup = 'root'
@@ -389,11 +389,11 @@ task tomcatRpm(type: Rpm) {
ospackage {
packageName 'apache-tomcat'
summary = 'Apache Tomcat RPM'
- vendor = 'Pivotal'
+ vendor = project.vendor
release = buildNumber()
version = tomcatVersion
os = LINUX
- license = "ASL 2.0"
+ license = project.license
user = 'root'
permissionGroup = 'root'
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6cff1b57/pxf/gradle.properties
----------------------------------------------------------------------
diff --git a/pxf/gradle.properties b/pxf/gradle.properties
index ae902b9..6a7b2d6 100644
--- a/pxf/gradle.properties
+++ b/pxf/gradle.properties
@@ -16,6 +16,8 @@
# under the License.
version=3.0.0
+license=ASL 2.0
+vendor=Apache HAWQ Incubating
hadoopVersion=2.7.1
hiveVersion=1.2.1
hbaseVersionJar=1.1.2