You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2019/06/21 19:53:07 UTC
[orc] branch branch-1.5 updated (70068c5 -> d544eba)
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a change to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git.
from 70068c5 ORC-334: [C++] Add AppVeyor support for integration on windows
new 41f5f71 ORC-366: Improve TZDIR setup for WIN32
new d544eba ORC-511: Fix debian 8 docker file
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
appveyor.yml | 4 ----
cmake_modules/ThirdpartyToolchain.cmake | 2 ++
docker/debian8/Dockerfile | 4 ++--
docker/debian8/apt.conf | 1 +
docker/debian8/sources.list | 7 +++++++
5 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 docker/debian8/apt.conf
create mode 100644 docker/debian8/sources.list
[orc] 01/02: ORC-366: Improve TZDIR setup for WIN32
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git
commit 41f5f713066e6354c8839978a750de3574ad3338
Author: rip-nsk <ri...@gmail.com>
AuthorDate: Wed May 16 13:10:43 2018 -0700
ORC-366: Improve TZDIR setup for WIN32
Fixes #271
Signed-off-by: Owen O'Malley <om...@apache.org>
---
appveyor.yml | 4 ----
cmake_modules/ThirdpartyToolchain.cmake | 2 ++
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index ddb66e9..dc09236 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,9 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-# Operating system (build VM template)
-# os: Visual Studio 2017
-
environment:
matrix:
- JOB: Visual Studio 2015
@@ -40,6 +37,5 @@ build_script:
-DBUILD_LIBHDFSPP=OFF
-DBUILD_TOOLS=OFF
-DBUILD_JAVA=OFF
- - set TZDIR=C:/projects/orc/build/tzdata_ep-prefix/src/tzdata_ep/share/zoneinfo
- cmake --build . --config %CONFIGURATION%
- ctest -VV -C %CONFIGURATION%
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 6e7ca98..f8584c0 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -176,6 +176,8 @@ if (WIN32)
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND "")
+ ExternalProject_Get_Property(tzdata_ep SOURCE_DIR)
+ set(TZDATA_DIR ${SOURCE_DIR}/share/zoneinfo)
endif ()
# ----------------------------------------------------------------------
[orc] 02/02: ORC-511: Fix debian 8 docker file
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git
commit d544ebad77d53728e5b05ea63bd2574442598424
Author: Owen O'Malley <om...@apache.org>
AuthorDate: Wed May 29 13:46:57 2019 -0700
ORC-511: Fix debian 8 docker file
Signed-off-by: Owen O'Malley <om...@apache.org>
---
docker/debian8/Dockerfile | 4 ++--
docker/debian8/apt.conf | 1 +
docker/debian8/sources.list | 7 +++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/docker/debian8/Dockerfile b/docker/debian8/Dockerfile
index ab8d4c7..24145ba 100644
--- a/docker/debian8/Dockerfile
+++ b/docker/debian8/Dockerfile
@@ -20,8 +20,7 @@
FROM debian:8
MAINTAINER Owen O'Malley <ow...@hortonworks.com>
-RUN echo "deb http://ftp.debian.org/debian jessie-backports main" \
- >> /etc/apt/sources.list
+ADD sources.list apt.conf /etc/apt/
RUN apt-get update
RUN apt-get install -y \
@@ -37,6 +36,7 @@ RUN apt-get install -y \
maven \
pkg-config \
wget
+
RUN apt-get -t jessie-backports install -y openjdk-8-jdk
RUN update-alternatives --set java \
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
diff --git a/docker/debian8/apt.conf b/docker/debian8/apt.conf
new file mode 100644
index 0000000..019d783
--- /dev/null
+++ b/docker/debian8/apt.conf
@@ -0,0 +1 @@
+Acquire::Check-Valid-Until "false";
\ No newline at end of file
diff --git a/docker/debian8/sources.list b/docker/debian8/sources.list
new file mode 100644
index 0000000..735d7c8
--- /dev/null
+++ b/docker/debian8/sources.list
@@ -0,0 +1,7 @@
+deb http://deb.debian.org/debian/ jessie main contrib non-free
+deb-src http://deb.debian.org/debian/ jessie main contrib non-free
+
+deb http://security.debian.org/ jessie/updates main contrib non-free
+deb-src http://security.debian.org/ jessie/updates main contrib non-free
+
+deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main