Commit 8c7ff83f authored by jehan's avatar jehan

Merge remote-tracking branch 'origin/master' into fix/limev2_windows_build

parents 843fa437 e4fd01a5
Subproject commit 15c1b3b61eae7f8cf81577eebc6565e71be40abb
Subproject commit da379dcd9581a84b0f6f570aa2564309337636c1
Subproject commit fd38ca9599ce2d11ede23d892c1d8588115cf2be
Subproject commit 0ced10157aa8141b64755ce24b2b43fa16a8491d
Subproject commit 82760e706891b8fdbb3d392e3cb16a9d4440e266
Subproject commit ec89a3a7edd1d364d606a1bc621b4064c1f56fcd
......@@ -37,6 +37,10 @@ linphone_sdk_get_inherited_cmake_args()
linphone_sdk_get_enable_cmake_args()
list(APPEND _cmake_args ${_enable_cmake_args})
if(LINPHONESDK_PREBUILD_DEPENDENCIES)
set(_ep_depends DEPENDS ${LINPHONESDK_PREBUILD_DEPENDENCIES})
endif()
if(WIN32)
set(_install_command "${CMAKE_SOURCE_DIR}/cmake/dummy.bat")
else()
......
......@@ -27,6 +27,9 @@ include(LinphoneSdkUtils)
linphone_sdk_check_git()
set(TUNNEL_REVISION "05f359e6b3c8775fb96ca8be52f4456a22d3a912")
if(IS_DIRECTORY "${LINPHONESDK_DIR}/tunnel")
execute_process(
COMMAND "${GIT_EXECUTABLE}" "pull"
......@@ -38,3 +41,8 @@ else()
WORKING_DIRECTORY "${LINPHONESDK_DIR}"
)
endif()
execute_process(
COMMAND "${GIT_EXECUTABLE}" "checkout" "${TUNNEL_REVISION}"
WORKING_DIRECTORY "${LINPHONESDK_DIR}/tunnel"
)
BASE_NAME=gitlab.linphone.org:4567/bc/public/linphone-sdk
android-r16b:
docker build -f bc-dev-android-r16b -t $(BASE_NAME)/bc-dev-android:r16b --rm .
android-r17c:
docker build -f bc-dev-android-r17c -t $(BASE_NAME)/bc-dev-android:r17c --rm .
centos7:
docker build -f bc-dev-centos7 -t $(BASE_NAME)/bc-dev-centos:7 --rm .
......@@ -9,4 +15,4 @@ debian8:
debian9:
docker build -f bc-dev-debian9 -t $(BASE_NAME)/bc-dev-debian:9 --rm .
.PHONY: centos7 debian8 debian9
.PHONY: android-r16b android-r17c centos7 debian8 debian9
......@@ -2,15 +2,21 @@ FROM debian:stretch
MAINTAINER Ghislain MARY <ghislain.mary@belledonne-communications.com>
#RUN localedef -i en_US -f UTF-8 en_US.UTF-8
# Configure locale
RUN apt-get update && \
apt-get install -y locales && \
apt-get clean && \
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
ENV SHELL=/bin/bash
# Define environment
ENV ANDROID_NDK r16b
ENV ANDROID_SDK 25.2.5
ENV ANDROID_HOME /opt/android-sdk-linux
#ENV LANG en_US.UTF-8
#ENV LC_ALL en_US.UTF-8
ENV SHELL=/bin/bash
# Install common general tools
RUN apt-get update && \
......
......@@ -2,15 +2,21 @@ FROM debian:stretch
MAINTAINER Ghislain MARY <ghislain.mary@belledonne-communications.com>
#RUN localedef -i en_US -f UTF-8 en_US.UTF-8
# Configure locale
RUN apt-get update && \
apt-get install -y locales && \
apt-get clean && \
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
ENV SHELL=/bin/bash
# Define environment
ENV ANDROID_NDK r17c
ENV ANDROID_SDK 25.2.5
ENV ANDROID_HOME /opt/android-sdk-linux
#ENV LANG en_US.UTF-8
#ENV LC_ALL en_US.UTF-8
ENV SHELL=/bin/bash
# Install common general tools
RUN apt-get update && \
......
......@@ -2,6 +2,15 @@ FROM debian:jessie
MAINTAINER Ghislain MARY <ghislain.mary@belledonne-communications.com>
# Configure locale
RUN apt-get update && \
apt-get install -y locales && \
apt-get clean && \
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
ENV SHELL=/bin/bash
#ENV PS1='\[\e[33m\]\u@bc-dev-debian8>\[\e[0m\] '
......
......@@ -2,6 +2,15 @@ FROM debian:stretch
MAINTAINER Ghislain MARY <ghislain.mary@belledonne-communications.com>
# Configure locale
RUN apt-get update && \
apt-get install -y locales && \
apt-get clean && \
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
ENV SHELL=/bin/bash
#ENV PS1='\[\e[33m\]\u@bc-dev-debian9>\[\e[0m\] '
......
Subproject commit 8eaee53c4380ef65fa7d64a7da2e268eebbde99f
Subproject commit 122d6a4a461023899306bb8e6c9d108cb0dc65e0
Subproject commit c48ef3eb0dc093e17190c6275920a8f54691b48b
Subproject commit d58fc248f2d1c65eaa3df9258d161a878785cb55
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment