hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject incubator-hawq git commit: HAWQ-888. Remove some dummy files which were used to keep related "empty" directories.
Date Wed, 06 Jul 2016 02:20:23 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 383818c28 -> 3ba7d8ef4


HAWQ-888. Remove some dummy files which were used to keep related "empty" directories.


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

Branch: refs/heads/master
Commit: 3ba7d8ef4b27b11bec02beefe0dd037698687175
Parents: 383818c
Author: Paul Guo <paulguo@gmail.com>
Authored: Tue Jul 5 18:16:17 2016 +0800
Committer: Paul Guo <paulguo@gmail.com>
Committed: Wed Jul 6 10:11:45 2016 +0800

----------------------------------------------------------------------
 contrib/Makefile                                             | 1 -
 depends/thirdparty/.gitignore                                | 2 ++
 depends/thirdparty/README                                    | 5 +++++
 depends/thirdparty/gp-xerces/git_keep_empty_directory.readme | 8 --------
 depends/thirdparty/gporca/git_keep_empty_directory.readme    | 8 --------
 depends/thirdparty/gpos/git_keep_empty_directory.readme      | 8 --------
 depends/thirdparty/postgres/git_keep_empty_directory.readme  | 8 --------
 src/backend/Makefile                                         | 3 ---
 src/pl/Makefile                                              | 1 -
 src/pl/plr/git_keep_empty_directory.readme                   | 8 --------
 10 files changed, 7 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/contrib/Makefile
----------------------------------------------------------------------
diff --git a/contrib/Makefile b/contrib/Makefile
index 1d4939f..1da02f6 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -25,7 +25,6 @@ pgcrypto_prepare: pgcrypto_prepare_timestamp
 	if [ ! -f $(abs_top_builddir)/$(subdir)/pgcrypto_prepare_timestamp ]; then \
 		[ "x$(pgcrypto_commit)" != "x" ] || exit 1; \
 		cd $(abs_top_srcdir)/depends/thirdparty; mkdir -p postgres; cd postgres; \
-		rm -f git_keep_empty_directory.readme; \
 		[ ! -d .git ] && git clone https://github.com/postgres/postgres.git .; \
 		git reset --hard $(pgcrypto_commit) || (echo Now fetch from upstream and try again; git
fetch origin master; git reset --hard $(pgcrypto_commit)) || exit 2; \
 		rm -f contrib/pgcrypto/pgcrypto.sql.in contrib/pgcrypto/uninstall_pgcrypto.sql; \

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/depends/thirdparty/.gitignore
----------------------------------------------------------------------
diff --git a/depends/thirdparty/.gitignore b/depends/thirdparty/.gitignore
index 74cf5a9..0644298 100644
--- a/depends/thirdparty/.gitignore
+++ b/depends/thirdparty/.gitignore
@@ -1,4 +1,6 @@
 *_timestamp
+
+# Do not remove them since they are auto-created but ignored when building related features.
 gp-xerces/
 gporca/
 gpos/

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/depends/thirdparty/README
----------------------------------------------------------------------
diff --git a/depends/thirdparty/README b/depends/thirdparty/README
new file mode 100644
index 0000000..141a4ef
--- /dev/null
+++ b/depends/thirdparty/README
@@ -0,0 +1,5 @@
+Please do not create following directories yourselves:
+	gporca, gp-xerces, gpos, postgres
+since they are auto-created and used when building some related features, i.e.
+orca support (enable-orca), pgcrypto support (with-pgcrypto).
+See src/backend/Makefile and contrib/Makefile for details.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/depends/thirdparty/gp-xerces/git_keep_empty_directory.readme
----------------------------------------------------------------------
diff --git a/depends/thirdparty/gp-xerces/git_keep_empty_directory.readme b/depends/thirdparty/gp-xerces/git_keep_empty_directory.readme
deleted file mode 100644
index b80ff26..0000000
--- a/depends/thirdparty/gp-xerces/git_keep_empty_directory.readme
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a file to keep the "empty" directory in git repo to remind
-developers to avoid manipulating it himself/herself.
-
-This directory is for git-clone, git patch and then build of related git
-repo when building related features. Please do not write any files into the
-directory if it is empty, and if you are not developing related features
-and are not familiar with the related build mechanism you'd better not
-modify/add/delete files under this directory.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/depends/thirdparty/gporca/git_keep_empty_directory.readme
----------------------------------------------------------------------
diff --git a/depends/thirdparty/gporca/git_keep_empty_directory.readme b/depends/thirdparty/gporca/git_keep_empty_directory.readme
deleted file mode 100644
index b80ff26..0000000
--- a/depends/thirdparty/gporca/git_keep_empty_directory.readme
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a file to keep the "empty" directory in git repo to remind
-developers to avoid manipulating it himself/herself.
-
-This directory is for git-clone, git patch and then build of related git
-repo when building related features. Please do not write any files into the
-directory if it is empty, and if you are not developing related features
-and are not familiar with the related build mechanism you'd better not
-modify/add/delete files under this directory.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/depends/thirdparty/gpos/git_keep_empty_directory.readme
----------------------------------------------------------------------
diff --git a/depends/thirdparty/gpos/git_keep_empty_directory.readme b/depends/thirdparty/gpos/git_keep_empty_directory.readme
deleted file mode 100644
index b80ff26..0000000
--- a/depends/thirdparty/gpos/git_keep_empty_directory.readme
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a file to keep the "empty" directory in git repo to remind
-developers to avoid manipulating it himself/herself.
-
-This directory is for git-clone, git patch and then build of related git
-repo when building related features. Please do not write any files into the
-directory if it is empty, and if you are not developing related features
-and are not familiar with the related build mechanism you'd better not
-modify/add/delete files under this directory.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/depends/thirdparty/postgres/git_keep_empty_directory.readme
----------------------------------------------------------------------
diff --git a/depends/thirdparty/postgres/git_keep_empty_directory.readme b/depends/thirdparty/postgres/git_keep_empty_directory.readme
deleted file mode 100644
index b80ff26..0000000
--- a/depends/thirdparty/postgres/git_keep_empty_directory.readme
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a file to keep the "empty" directory in git repo to remind
-developers to avoid manipulating it himself/herself.
-
-This directory is for git-clone, git patch and then build of related git
-repo when building related features. Please do not write any files into the
-directory if it is empty, and if you are not developing related features
-and are not familiar with the related build mechanism you'd better not
-modify/add/delete files under this directory.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/src/backend/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/Makefile b/src/backend/Makefile
index eb3a6a3..7544b14 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -146,7 +146,6 @@ gporca_prepare: $(ORCA_BLD_PATH)/gporca_prepare_timestamp
 	if [ ! -f $(ORCA_BLD_PATH)/gporca_prepare_timestamp ]; then \
 		[ "x$(gporca_commit)" != "x" ] || exit 1; \
 		cd $(ORCA_SRC_PATH); mkdir -p gporca; cd gporca; \
-		rm -f git_keep_empty_directory.readme; \
 		[ ! -d .git ] && git clone $(gporca_git) . && git checkout $(gporca_branch);
\
 		git reset --hard $(gporca_commit) || (echo Now fetch from upstream and try again; git fetch
origin $(gporca_git); git reset --hard $(gporca_commit)) || exit 2; \
 		touch $(ORCA_BLD_PATH)/gporca_prepare_timestamp; \
@@ -156,7 +155,6 @@ gpos_prepare: $(ORCA_BLD_PATH)/gpos_prepare_timestamp
 	if [ ! -f $(ORCA_BLD_PATH)/gpos_prepare_timestamp ]; then \
 		[ "x$(gpos_commit)" != "x" ] || exit 1; \
 		cd $(ORCA_SRC_PATH); mkdir -p gpos; cd gpos; \
-		rm -f git_keep_empty_directory.readme; \
 		[ ! -d .git ] && git clone $(gpos_git) . && git checkout $(gpos_branch);
\
 		git reset --hard $(gpos_commit) || (echo Now fetch from upstream and try again; git fetch
origin $(gpos_git); git reset --hard $(gpos_commit)) || exit 2; \
 		touch $(ORCA_BLD_PATH)/gpos_prepare_timestamp; \
@@ -166,7 +164,6 @@ gp-xerces_prepare: $(ORCA_BLD_PATH)/gp-xerces_prepare_timestamp
 	if [ ! -f $(ORCA_BLD_PATH)/gp-xerces_prepare_timestamp ]; then \
 		[ "x$(gp_xerces_commit)" != "x" ] || exit 1; \
 		cd $(ORCA_SRC_PATH); mkdir -p gp-xerces; cd gp-xerces; \
-		rm -f git_keep_empty_directory.readme; \
 		[ ! -d .git ] && git clone $(gp_xerces_git) . && git checkout $(gp_xerces_branch);
\
 		git reset --hard $(gp_xerces_commit) || (echo Now fetch from upstream and try again; git
fetch origin $(gp_xerces_git); git reset --hard $(gp_xerces_commit)) || exit 2; \
 		touch $(ORCA_BLD_PATH)/gp-xerces_prepare_timestamp; \

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/src/pl/Makefile
----------------------------------------------------------------------
diff --git a/src/pl/Makefile b/src/pl/Makefile
index 8babb18..0792f49 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -43,7 +43,6 @@ plr_prepare: plr_prepare_timestamp
 	if [ ! -f $(abs_top_builddir)/$(subdir)/plr_prepare_timestamp ]; then \
 		[ "x$(plr_commit)" != "x" ] || exit 1; \
 		cd $(abs_top_srcdir)/$(subdir); mkdir -p plr; cd plr; \
-		rm -f git_keep_empty_directory.readme; \
 		[ ! -d .git ] && git clone https://github.com/jconway/plr.git .; \
 		git reset --hard $(plr_commit) || (echo Now fetch from upstream and try again; git fetch
origin master; git reset --hard $(plr_commit)) || exit 2; \
 		git apply ../plr.patch || exit 3; \

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3ba7d8ef/src/pl/plr/git_keep_empty_directory.readme
----------------------------------------------------------------------
diff --git a/src/pl/plr/git_keep_empty_directory.readme b/src/pl/plr/git_keep_empty_directory.readme
deleted file mode 100644
index b80ff26..0000000
--- a/src/pl/plr/git_keep_empty_directory.readme
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a file to keep the "empty" directory in git repo to remind
-developers to avoid manipulating it himself/herself.
-
-This directory is for git-clone, git patch and then build of related git
-repo when building related features. Please do not write any files into the
-directory if it is empty, and if you are not developing related features
-and are not familiar with the related build mechanism you'd better not
-modify/add/delete files under this directory.


Mime
View raw message