Skip to content

Commit f038ef9

Browse files
authored
Version 1.3.1 (#180)
1 parent 15813cc commit f038ef9

File tree

184 files changed

+5474
-4590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+5474
-4590
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ include(cmake/Version.cmake)
44
rsid_extract_version()
55
project(RealSenseID VERSION ${RSID_VERSION})
66

7-
# C++14 and above
7+
# C++17 and above
88
if(NOT CMAKE_CXX_STANDARD)
9-
set(CMAKE_CXX_STANDARD 14)
9+
set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1111
endif()
1212

@@ -61,7 +61,7 @@ message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
6161
option(RSID_DEBUG_CONSOLE "Log everything to console" ON)
6262
option(RSID_DEBUG_FILE "Log everything to rsid_debug.log file" OFF)
6363
option(RSID_DEBUG_SERIAL "Log all serial communication" OFF)
64-
option(RSID_DEBUG_PACKETS "Log packet sent/received over the serial line" ON)
64+
option(RSID_DEBUG_PACKETS "Log packet sent/received over the serial line" OFF)
6565
option(RSID_DEBUG_VALUES "Replace default common values with debug ones" OFF)
6666
option(RSID_SAMPLES "Build samples" OFF)
6767
option(RSID_TIDY "Enable clang-tidy" OFF)
@@ -71,7 +71,7 @@ option(RSID_DOXYGEN "Build doxygen docs" OFF)
7171
option(RSID_SECURE "Enable secure communication with device" OFF)
7272
option(RSID_TOOLS "Build additional tools" ON)
7373
option(RSID_PY "Build python wrapper" OFF)
74-
option(RSID_NETWORK "Enable networking. Required for license and update checker." ON)
74+
option(RSID_NETWORK "Enable networking. Required for update checker." OFF)
7575

7676
if(NOT ANDROID)
7777
# preview option

Dockerfile

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
FROM bellsoft/liberica-openjdk-debian:21 AS base
2+
3+
LABEL maintainer="RealSense-ID Team"
4+
5+
# Base environment
6+
RUN set -eux; \
7+
apt-get -qq update \
8+
&& apt-get -qqy --no-install-recommends install \
9+
apt-utils \
10+
zip \
11+
unzip \
12+
curl \
13+
lldb \
14+
swig \
15+
git \
16+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
17+
18+
# Command line tools only
19+
# https://developer.android.com/studio/index.html
20+
ENV ANDROID_SDK_TOOLS_VERSION=13114758
21+
ENV ANDROID_SDK_TOOLS_CHECKSUM=7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee
22+
23+
ENV ANDROID_HOME="/opt/android-sdk-linux"
24+
ENV ANDROID_SDK_ROOT=$ANDROID_HOME
25+
ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools
26+
27+
ENV DEBIAN_FRONTEND=noninteractive
28+
ENV LANG=en_US.UTF-8
29+
30+
# Download and unzip Android SDK Tools
31+
RUN set -eux; \
32+
curl -Ls https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip > /tools.zip \
33+
&& echo "$ANDROID_SDK_TOOLS_CHECKSUM /tools.zip" | sha256sum -c \
34+
&& unzip -qq /tools.zip -d $ANDROID_HOME \
35+
&& rm -v /tools.zip
36+
37+
# Accept licenses
38+
RUN set -eux; \
39+
mkdir -p $ANDROID_HOME/licenses/ \
40+
&& echo "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_HOME/licenses/android-sdk-license \
41+
&& echo "84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > $ANDROID_HOME/licenses/android-sdk-preview-license --licenses \
42+
&& yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --licenses --sdk_root=${ANDROID_SDK_ROOT}
43+
44+
ENV HOME=/rsid-builder
45+
WORKDIR $HOME
46+
47+
RUN set -eux; \
48+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update && \
49+
# $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --list && \
50+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "ndk;27.0.12077973" &&\
51+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "build-tools;35.0.0" &&\
52+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "build-tools;34.0.0" &&\
53+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-25" &&\
54+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-35" &&\
55+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" &&\
56+
$ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "cmake;3.31.6"
57+
58+
## HOW TO BUILD
59+
# docker build -t rsid-builder:latest .
60+
# docker run --rm -it -v.:/rsid-builder rsid-builder bash -c "cd wrappers/android && ./gradlew clean bundleStandardReleaseAar"
61+
# Find your output in `wrappers/android/build/outputs/aar/`

0 commit comments

Comments
 (0)