hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [hawq] branch master updated: HAWQ-1752. Remove tracked Makefile.global
Date Tue, 27 Aug 2019 08:18:33 GMT
This is an automated email from the ASF dual-hosted git repository.

huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git


The following commit(s) were added to refs/heads/master by this push:
     new 6dcfe6e  HAWQ-1752. Remove tracked Makefile.global
6dcfe6e is described below

commit 6dcfe6e8c09f17ddf390f88627a52c6d683c9c6d
Author: wang.ziming <wang.ziming@oushu.io>
AuthorDate: Tue Aug 27 14:43:34 2019 +0800

    HAWQ-1752. Remove tracked Makefile.global
---
 .travis.yml                      | 11 +----------
 depends/dbcommon/Makefile.global | 40 ----------------------------------------
 depends/storage/Makefile.global  | 40 ----------------------------------------
 depends/univplan/Makefile.global | 40 ----------------------------------------
 4 files changed, 1 insertion(+), 130 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a58e81e..a3df596 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,19 +77,10 @@ install:
   - sudo pip install pycrypto
   - sudo pip install cogapp
   - sudo cpanm install JSON
-  - sudo mkdir -p /usr/local/opt/hawq-dep
-  - sudo mkdir -p /usr/local/opt/hawq-dep/bin
-  - sudo mkdir -p /usr/local/opt/hawq-dep/lib
-  - sudo mkdir -p /usr/local/opt/hawq-dep/include
-  - sudo cp -rf /usr/local/opt/openssl/bin/* /usr/local/opt/hawq-dep/bin/
-  - sudo cp -rf /usr/local/opt/openssl/lib/* /usr/local/opt/hawq-dep/lib/
-  - sudo cp -rf /usr/local/opt/openssl/include/* /usr/local/opt/hawq-dep/include/
-  - sudo cp -rf /usr/local/opt/jsoncpp/lib/* /usr/local/opt/hawq-dep/lib/
-  - sudo cp -rf /usr/local/opt/jsoncpp/include/* /usr/local/opt/hawq-dep/include/
 
 before_script:
   - mvn apache-rat:check
-  - export DEPENDENCY_INSTALL_PREFIX=/usr/local/opt/hawq-dep
+  - export DEPENDENCY_INSTALL_PREFIX=/usr/local/opt/openssl
   - cd $TRAVIS_BUILD_DIR
   - ./configure
 
diff --git a/depends/dbcommon/Makefile.global b/depends/dbcommon/Makefile.global
deleted file mode 100644
index e471d53..0000000
--- a/depends/dbcommon/Makefile.global
+++ /dev/null
@@ -1,40 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# -*-makefile-*-
-#------------------------------------------------------------------------------
-# A makefile that integrate building this module with hawq
-#------------------------------------------------------------------------------
-
-prefix := /usr/local/hawq
-enable_debug    = no
-enable_coverage = no
-with_dbcommon = yes
-
-# Support for VPATH builds
-vpath_build = no
-abs_top_srcdir = /data/apache-hawq
-abs_top_builddir = /data/apache-hawq
-
-ifneq ($(vpath_build),yes)
-top_srcdir = $(top_builddir)
-srcdir = .
-else # vpath_build = yes
-top_srcdir = $(abs_top_srcdir)
-srcdir = $(top_srcdir)/$(subdir)
-
-endif
diff --git a/depends/storage/Makefile.global b/depends/storage/Makefile.global
deleted file mode 100644
index 8fd25bf..0000000
--- a/depends/storage/Makefile.global
+++ /dev/null
@@ -1,40 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# -*-makefile-*-
-#------------------------------------------------------------------------------
-# A makefile that integrate building this module with hawq
-#------------------------------------------------------------------------------
-
-prefix := /usr/local/hawq
-enable_debug    = no
-enable_coverage = no
-with_storage = yes
-
-# Support for VPATH builds
-vpath_build = no
-abs_top_srcdir = /data/apache-hawq
-abs_top_builddir = /data/apache-hawq
-
-ifneq ($(vpath_build),yes)
-top_srcdir = $(top_builddir)
-srcdir = .
-else # vpath_build = yes
-top_srcdir = $(abs_top_srcdir)
-srcdir = $(top_srcdir)/$(subdir)
-
-endif
diff --git a/depends/univplan/Makefile.global b/depends/univplan/Makefile.global
deleted file mode 100644
index a291648..0000000
--- a/depends/univplan/Makefile.global
+++ /dev/null
@@ -1,40 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# -*-makefile-*-
-#------------------------------------------------------------------------------
-# A makefile that integrate building this module with hawq
-#------------------------------------------------------------------------------
-
-prefix := /usr/local/hawq
-enable_debug    = no
-enable_coverage = no
-with_univplan = yes
-
-# Support for VPATH builds
-vpath_build = no
-abs_top_srcdir = /data/apache-hawq
-abs_top_builddir = /data/apache-hawq
-
-ifneq ($(vpath_build),yes)
-top_srcdir = $(top_builddir)
-srcdir = .
-else # vpath_build = yes
-top_srcdir = $(abs_top_srcdir)
-srcdir = $(top_srcdir)/$(subdir)
-
-endif


Mime
View raw message