Move gphdfs to gpcontrib

Co-authored-by: NJimmy Yih <jyih@pivotal.io>

gpAux/Makefile

@@ -342,7 +342,7 @@ define BUILD_STEPS
 	@$(MAKE) mkpgbouncer INSTLOC=$(INSTLOC) BUILDDIR=$(BUILDDIR)
 	@$(MAKE) mkpgbench INSTLOC=$(INSTLOC) BUILDDIR=$(BUILDDIR)
 	if [ "$(findstring $(BLD_ARCH),$(SERVER_PLATFORMS))" != "" ]; then \
-	  $(MAKE) mkgphdfs INSTLOC=$(INSTLOC) && \
+	  $(MAKE) -C ../gpcontrib mkgphdfs INSTLOC=$(INSTLOC) && \
 	  $(MAKE) mkorafce INSTLOC=$(INSTLOC);  \
 	fi
 	@$(MAKE) copydocs INSTLOC=$(INSTLOC)
@@ -878,9 +878,6 @@ set_scripts_version :
 # Internal functions
 #---------------------------------------------------------------------
 
-mkgphdfs:
-	@cd extensions && $(MAKE) mkgphdfs OPT="$(INSTCFLAGS)" INSTLOC=$(INSTLOC)
-
 mkorafce:
 	@cd extensions && $(MAKE) mkorafce OPT="$(INSTCFLAGS)" INSTLOC=$(INSTLOC)
 

gpAux/extensions/Makefile

@@ -15,48 +15,23 @@ ifneq (${ENV_JAVA_HOME},)
 	JAVA_HOME=${ENV_JAVA_HOME}
 endif
 
-.PHONY: all install clean distclean installcheck gphdfs mkgphdfs mkorafce
+.PHONY: all install clean distclean installcheck mkorafce
 
 #
 # targets built via top_builddir/GNUmakefile
 #
 
-all: gphdfs
-
-gphdfs:
-	@if [ "$(enable_gphdfs)" = "yes" ]; then \
-		echo "gphdfs enabled"; \
-		$(MAKE) -C gphdfs; \
-	fi
-
-install:
-	@if [ "$(enable_gphdfs)" = "yes" ]; then \
-		$(MAKE) -C gphdfs docdir=$(INSTLOC)/docs install; \
-	fi
-
-clean:
-	if [ "$(enable_gphdfs)" = "yes" ]; then $(MAKE) -C gphdfs clean; fi
-
-distclean:
-	if [ "$(enable_gphdfs)" = "yes" ]; then $(MAKE) -C gphdfs distclean; fi
-
 installcheck:
 	if [ -d "$(ext_dir)" ]; then \
 		PATH=$(INSTLOC)/bin:$(PATH) $(MAKE) -C orafce installcheck USE_PGXS=1 && \
-		PATH=$(INSTLOC)/bin:$(PATH) $(MAKE) -C gphdfs installcheck USE_PGXS=1 ; \
 	fi; \
 
 #
 # below targets will be built via top_builddir/gpAux/Makefile
 #
 
-mkgphdfs:
-	PATH=$(INSTLOC)/bin:$(PATH) $(MAKE) -C gphdfs USE_PGXS=1 docdir=$(INSTLOC)/docs install \
-		ANT=/opt/releng/apache-ant/bin/ant \
-		JAVA_HOME=${JAVA_HOME}
-
 # Only include these files when running enterprise build
-ENTERPRISE_TARGETS="mkgphdfs mkorafce"
+ENTERPRISE_TARGETS="mkorafce"
 ifneq ($(findstring $(MAKECMDGOALS), $(ENTERPRISE_TARGETS)),)
 include $(BLD_TOP)/Makefile.global
 include $(BLD_TOP)/Makefile.thirdparty

gpcontrib/Makefile

@@ -3,12 +3,15 @@
 default: all
 
 BLD_TOP=..
-include $(BLD_TOP)/gpAux/Makefile.windows
+
+GPAUX_DIR=$(BLD_TOP)/gpAux/
+
+ext_dir=$(BLD_TOP)/gpAux/ext
 
 top_builddir = ..
 include $(top_builddir)/src/Makefile.global
 
-.PHONY: all install clean distclean gpcloud pxf mapreduce
+.PHONY: all install clean distclean gpcloud pxf mapreduce gphdfs mkgphdfs
 
 #
 # targets built via top_builddir/GNUmakefile
@@ -41,6 +44,16 @@ mapreduce:
 		$(MAKE) -C gpmapreduce; \
 	fi
 
+gphdfs:
+	@if [ "$(enable_gphdfs)" = "yes" ]; then \
+		echo "gphdfs enabled"; \
+		$(MAKE) -C gphdfs; \
+	fi
+
+mkgphdfs:
+	PATH=$(INSTLOC)/bin:$(PATH) $(MAKE) -C gphdfs USE_PGXS=1 install \
+		JAVA_HOME=${JAVA_HOME}
+
 install:
 	@if [ "$(enable_gpcloud)" = "yes" ]; then \
 		$(MAKE) -C gpcloud install && \
@@ -50,25 +63,32 @@ install:
 		$(MAKE) -C gpmapreduce install; \
 	fi
 	if [ "$(enable_pxf)" = "yes" ]; then $(MAKE) -C pxf install; fi
+	@if [ "$(enable_gphdfs)" = "yes" ]; then \
+		$(MAKE) -C gphdfs docdir=$(INSTLOC)/docs install; \
+	fi
 
 clean:
 	if [ "$(enable_mapreduce)" = "yes" ]; then $(MAKE) -C gpmapreduce clean; fi
 	if [ "$(enable_gpcloud)" = "yes" ]; then $(MAKE) -C gpcloud cleanall; fi
 	if [ "$(enable_pxf)" = "yes" ]; then $(MAKE) -C pxf clean; fi
+	if [ "$(enable_gphdfs)" = "yes" ]; then $(MAKE) -C gphdfs clean; fi
 
 distclean:
 	if [ "$(enable_mapreduce)" = "yes" ]; then $(MAKE) -C gpmapreduce distclean; fi
 	if [ "$(enable_gpcloud)" = "yes" ]; then $(MAKE) -C gpcloud distclean; fi
 	if [ "$(enable_pxf)" = "yes" ]; then $(MAKE) -C pxf distclean; fi
+	if [ "$(enable_gphdfs)" = "yes" ]; then $(MAKE) -C gphdfs distclean; fi
 
 installcheck:
 	if [ "$(enable_mapreduce)" = "yes" ]; then \
 		$(MAKE) -C gpmapreduce installcheck; \
 	fi
+	if [ -d "$(ext_dir)" ]; then \
+		PATH=$(INSTLOC)/bin:$(PATH) $(MAKE) -C gphdfs installcheck USE_PGXS=1 ; \
+	fi
 
 unittest-check:
 	@if [ "$(enable_pxf)" = "yes" ]; then \
 		echo "pxf enabled"; \
 		$(MAKE) -C pxf unittest-check; \
 	fi
-

gpAux/extensions/gphdfs/Makefile → gpcontrib/gphdfs/Makefile

@@ -7,15 +7,15 @@ PG_LIBS = $(libpq_pgport)
 
 ANT = ant
 TAR = tar
-ANT_OPTS="-Djavax.net.ssl.trustStore=../../releng/make/dependencies/cacerts"
+ANT_OPTS="-Djavax.net.ssl.trustStore=../../gpAux/releng/make/dependencies/cacerts"
 
 ifdef USE_PGXS
 	PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
-	top_builddir = ../../..
+	top_builddir = ../..
 	include $(top_builddir)/src/Makefile.global
-	include $(top_srcdir)/contrib/contrib-global.mk
+	include $(top_builddir)/contrib/contrib-global.mk
 endif
 
 JAR_FILES = dist/hadoop-gnet-1.2.0.0.jar