hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject incubator-hawq git commit: HAWQ-781. Move src/postgres to depends/thirdparty/postgres
Date Wed, 08 Jun 2016 05:28:37 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master d65ca5975 -> 2e7b8d749


HAWQ-781. Move src/postgres to depends/thirdparty/postgres


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

Branch: refs/heads/master
Commit: 2e7b8d749a701a9517819b36873485e62e38f0bf
Parents: d65ca59
Author: Paul Guo <paulguo@gmail.com>
Authored: Tue Jun 7 17:27:20 2016 +0800
Committer: rlei <rlei@pivotal.io>
Committed: Wed Jun 8 13:28:12 2016 +0800

----------------------------------------------------------------------
 .gitmodules                   | 4 ++--
 contrib/Makefile              | 2 +-
 contrib/pgcrypto              | 2 +-
 contrib/pgcrypto.patch        | 4 ++--
 depends/thirdparty/.gitignore | 1 +
 depends/thirdparty/postgres   | 1 +
 src/.gitignore                | 1 -
 src/Makefile.global.in        | 4 ++--
 src/postgres                  | 1 -
 9 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/.gitmodules
----------------------------------------------------------------------
diff --git a/.gitmodules b/.gitmodules
index 40ab4f3..f289853 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,6 @@
 [submodule "src/pl/plr"]
 	path = src/pl/plr
 	url = https://github.com/jconway/plr.git
-[submodule "src/postgres"]
-	path = src/postgres
+[submodule "depends/thirdparty/postgres"]
+	path = depends/thirdparty/postgres
 	url = https://github.com/postgres/postgres.git

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/contrib/Makefile
----------------------------------------------------------------------
diff --git a/contrib/Makefile b/contrib/Makefile
index 1701b23..a3c1804 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -17,7 +17,7 @@ WANTED_DIRS += pgcrypto
 # fixme: depend on pgcrypto.patch also.
 pgcrypto_prepare: pg_prepare
 	if [ ! -e $(abs_top_builddir)/$(subdir)/pgcrypto_prepare_timestamp ]; then \
-		(cd $(abs_top_srcdir)/src/postgres/contrib/pgcrypto; git apply $(abs_top_srcdir)/$(subdir)/pgcrypto.patch)
&& \
+		(cd $(abs_top_srcdir)/depends/thirdparty/postgres/contrib/pgcrypto; git apply $(abs_top_srcdir)/$(subdir)/pgcrypto.patch)
&& \
 		touch $(abs_top_builddir)/$(subdir)/pgcrypto_prepare_timestamp; \
 	fi
 else

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/contrib/pgcrypto
----------------------------------------------------------------------
diff --git a/contrib/pgcrypto b/contrib/pgcrypto
index 8c4adfc..a40c453 120000
--- a/contrib/pgcrypto
+++ b/contrib/pgcrypto
@@ -1 +1 @@
-../src/postgres/contrib/pgcrypto
\ No newline at end of file
+../depends/thirdparty/postgres/contrib/pgcrypto
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/contrib/pgcrypto.patch
----------------------------------------------------------------------
diff --git a/contrib/pgcrypto.patch b/contrib/pgcrypto.patch
index 3b2a633..eb650ca 100644
--- a/contrib/pgcrypto.patch
+++ b/contrib/pgcrypto.patch
@@ -25,8 +25,8 @@ index dadec95..3ec597d 100644
  else
 -subdir = contrib/pgcrypto
 -top_builddir = ../..
-+subdir = src/postgresql/contrib/pgcrypto
-+top_builddir = ../../../..
++subdir = depends/thirdparty/postgresql/contrib/pgcrypto
++top_builddir = ../../../../..
  include $(top_builddir)/src/Makefile.global
  include $(top_srcdir)/contrib/contrib-global.mk
  endif

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/depends/thirdparty/.gitignore
----------------------------------------------------------------------
diff --git a/depends/thirdparty/.gitignore b/depends/thirdparty/.gitignore
new file mode 100644
index 0000000..6c21398
--- /dev/null
+++ b/depends/thirdparty/.gitignore
@@ -0,0 +1 @@
+pg_prepare_timestamp

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/depends/thirdparty/postgres
----------------------------------------------------------------------
diff --git a/depends/thirdparty/postgres b/depends/thirdparty/postgres
new file mode 160000
index 0000000..ca59dfa
--- /dev/null
+++ b/depends/thirdparty/postgres
@@ -0,0 +1 @@
+Subproject commit ca59dfa6f727fe3bf3a01904ec30e87f7fa5a67e

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/src/.gitignore
----------------------------------------------------------------------
diff --git a/src/.gitignore b/src/.gitignore
index 8b5553c..1280701 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,5 +2,4 @@ Makefile.global
 Makefile.port
 Makefile.custom
 VERSIONS.mk
-pg_prepare_timestamp
 pl/plr_prepare_timestamp

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/src/Makefile.global.in
----------------------------------------------------------------------
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 5388cf4..988c922 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -696,8 +696,8 @@ pg_prepare:
 ifneq "$(findstring yes, $(with_pgcrypto))" ""
 	if [ ! -e $(abs_top_builddir)/pg_prepare_timestamp ]; then \
 		cd $(abs_top_srcdir); \
-		git submodule update --init src/postgres && \
-		touch $(abs_top_builddir)/src/pg_prepare_timestamp; \
+		git submodule update --init depends/thirdparty/postgres && \
+		touch $(abs_top_builddir)/depends/thirdparty/pg_prepare_timestamp; \
 	fi
 endif
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2e7b8d74/src/postgres
----------------------------------------------------------------------
diff --git a/src/postgres b/src/postgres
deleted file mode 160000
index ca59dfa..0000000
--- a/src/postgres
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca59dfa6f727fe3bf3a01904ec30e87f7fa5a67e


Mime
View raw message