Skip to content

Commit

Permalink
Merge v1.20.0 into community
Browse files Browse the repository at this point in the history
  • Loading branch information
@GovernikusAusweisApp2
GovernikusAusweisApp2 committed Jan 15, 2020
2 parents 684e3a1 + 68e416c commit 23952d6
Show file tree
Hide file tree
Showing 1,962 changed files with 15,561 additions and 11,595 deletions.
2 changes: 1 addition & 1 deletion CMakeGraphVizOptions.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# cmake --build . --target architecture
########################################

SET(GRAPHVIZ_IGNORE_TARGETS AusweisAppGlobal;AusweisAppExternal;cvc;fuzz;OpenSsl;tlscheck;Test;Script)
SET(GRAPHVIZ_IGNORE_TARGETS AusweisAppGlobal;AusweisAppExternal;cvc;fuzz;OpenSsl;tlscheck;Test;Script;testbedtool;tsParserFU)
SET(GRAPHVIZ_EXTERNAL_LIBS OFF)
SET(GRAPHVIZ_EXECUTABLES ON)
SET(GRAPHVIZ_GENERATE_PER_TARGET OFF)
Expand Down
35 changes: 23 additions & 12 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,29 @@ ELSE()
SET(LANGUAGES CXX)
ENDIF()

IF(APPLE AND NOT IOS)
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Required macOS version")
ENDIF()

PROJECT(AusweisApp2 VERSION 1.18.2 LANGUAGES ${LANGUAGES})
PROJECT(AusweisApp2 VERSION 1.20.0 LANGUAGES ${LANGUAGES})

# Set TWEAK if not defined in PROJECT_VERSION above to
# have a valid tweak version without propagating it
IF(NOT PROJECT_VERSION_TWEAK)
SET(PROJECT_VERSION_TWEAK 0)
ENDIF()

IF(APPLE AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.16" AND NOT tools.only)
ENABLE_LANGUAGE(OBJCXX)
ENDIF()

IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND (IOS OR ANDROID))
SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/dist" CACHE PATH "default install path" FORCE)
ENDIF()
SET(CMAKE_DIR "${PROJECT_SOURCE_DIR}/cmake")
SET(CMAKE_MODULE_PATH "${CMAKE_DIR}")
OPTION(BUILD_SHARED_LIBS "Enable build of shared libraries")
OPTION(INTEGRATED_SDK "Build platform specific SDK" OFF)

INCLUDE(Helper)

Expand Down Expand Up @@ -111,8 +118,11 @@ SET(SRC_DIR ${PROJECT_SOURCE_DIR}/src)
SET(TEST_DIR ${PROJECT_SOURCE_DIR}/test)
SET(RESOURCES_DIR ${PROJECT_SOURCE_DIR}/resources)
SET(PACKAGING_DIR ${RESOURCES_DIR}/packaging)
SET(COPYRIGHT_TEXT "&#9400\; 2014-2019 ${VENDOR}")
STRING(REPLACE " \& " " \& " COPYRIGHT_TEXT ${COPYRIGHT_TEXT})
SET(COPYRIGHT_TEXT "2014-2020 ${VENDOR}")
IF(APPLE)
STRING(REPLACE " \& " " \& " COPYRIGHT_TEXT ${COPYRIGHT_TEXT})
ENDIF()
SET(BUNDLE_IDENTIFIER com.governikus.ausweisapp2)

INCLUDE(Tools)
INCLUDE(DVCS)
Expand All @@ -126,22 +136,23 @@ IF(tools.only)
RETURN()
ENDIF()

INCLUDE(Libraries)
INCLUDE(CompilerFlags)

ADD_SUBDIRECTORY(resources)
ADD_SUBDIRECTORY(src)

IF("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
INCLUDE(CTest)
CONFIGURE_FILE("${CMAKE_DIR}/CTestCustom.cmake.in" "${CMAKE_BINARY_DIR}/CTestCustom.cmake" @ONLY)
CONFIGURE_FILE("${RESOURCES_DIR}/sonar-project.properties.in" "${CMAKE_BINARY_DIR}/sonar-project.properties" @ONLY)
ENDIF()

IF(BUILD_TESTING)
ADD_SUBDIRECTORY(test)
INCLUDE(Libraries)
INCLUDE(CompilerFlags)

IF(LINUX OR BSD)
INCLUDE(GNUInstallDirs)
ENDIF()

ADD_SUBDIRECTORY(resources)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(test)

IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/utils")
ADD_SUBDIRECTORY(utils)
ENDIF()
Expand Down
10 changes: 5 additions & 5 deletions LICENSE.officially.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,23 +339,23 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin

OpenSSL
Lizenz: OpenSSL license & SSLeay license
Version: 1.1.1c
Version: 1.1.1d
Adresse: https://www.openssl.org/

Qt
Lizenz: LGPL v3
Version: 5.12.4
Version: 5.12.5
Adresse: https://www.qt.io/

http_parser
Lizenz: MIT
Version: 2.9.2
Adresse: https://github.com/nodejs/http-parser/

Android Support Library V4
AndroidX Support Library
Lizenz: Apache 2.0
Version: 21.0.3
Adresse: https://developer.android.com/topic/libraries/support-library/
Version: 1.1.0
Adresse: https://developer.android.com/jetpack/androidx


Die Lizenztexte lauten in ihrer originalen Fassung wie folgt:
Expand Down
10 changes: 5 additions & 5 deletions LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,23 +302,23 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin

OpenSSL
Lizenz: OpenSSL license & SSLeay license
Version: 1.1.1c
Version: 1.1.1d
Adresse: https://www.openssl.org/

Qt
Lizenz: LGPL v3
Version: 5.12.4
Version: 5.12.5
Adresse: https://www.qt.io/

http_parser
Lizenz: MIT
Version: 2.9.2
Adresse: https://github.com/nodejs/http-parser/

Android Support Library V4
AndroidX Support Library
Lizenz: Apache 2.0
Version: 21.0.3
Adresse: https://developer.android.com/topic/libraries/support-library/
Version: 1.1.0
Adresse: https://developer.android.com/jetpack/androidx


Die Lizenztexte lauten in ihrer originalen Fassung wie folgt:
Expand Down
8 changes: 4 additions & 4 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ Für iOS wird die AusweisApp2 mittels XCode gebaut!
::

$ cd build
$ cmake -DCMAKE_PREFIX_PATH=/Users/governikus/Toolchain/dist -DCMAKE_TOOLCHAIN_FILE=../AusweisApp2/cmake/iOS.toolchain.cmake -DCMAKE_BUILD_TYPE=release ../AusweisApp2 -GXcode
$ xcodebuild -configuration Release
$ xcodebuild -target ipa -configuration Release
$ cmake -DCMAKE_PREFIX_PATH=/Users/governikus/Toolchain/dist -DCMAKE_TOOLCHAIN_FILE=../AusweisApp2/cmake/iOS.toolchain.cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../AusweisApp2 -GXcode
$ xcodebuild -configuration MinSizeRel -archivePath AusweisApp2.xcarchive -scheme AusweisApp archive
$ xcodebuild -configuration MinSizeRel -archivePath AusweisApp2.xcarchive -exportArchive -exportOptionsPlist exportOptions.plist -exportPath .


Im Build-Ordner befindet sich nun eine "AusweisApp2-x.y.z.ipa" Datei, welches das
Im Build-Ordner befindet sich nun ein *.ipa und ein *.xcarchive, welches jeweils das
signierte Bundle enthält!

Expand Down
6 changes: 1 addition & 5 deletions cmake/CompilerFlags.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DQT_NO_FOREACH)
ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
ADD_DEFINITIONS(-DQT_NO_EXCEPTIONS)

IF(NOT MSVC AND NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
IF(NOT MSVC AND NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC" AND "${Qt5Core_VERSION}" VERSION_LESS "6.0")
ADD_DEFINITIONS(-DQT_STRICT_ITERATORS)
ENDIF()

Expand Down Expand Up @@ -125,10 +125,6 @@ ELSE()
ENDIF()
ENDIF()

IF(APPLE AND NOT IOS)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ObjC++ -mmacosx-version-min=10.12")
ENDIF()


INCLUDE(CompilerFlagsPersoSim)

Expand Down
3 changes: 3 additions & 0 deletions cmake/Helper.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ FUNCTION(ADD_PLATFORM_LIBRARY _name)

ADD_LIBRARY(${_name} ${FILES})
TARGET_INCLUDE_DIRECTORIES(${_name} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
IF(IOS)
SET_TARGET_PROPERTIES(${_name} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
ENDIF()
ENDFUNCTION()


Expand Down
72 changes: 35 additions & 37 deletions cmake/Install.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,15 @@ IF(WIN32)
ENDIF()

IF(TARGET Qt5::Qml)
FETCH_TARGET_LOCATION(libEgl "Qt5::Gui_EGL")
FETCH_TARGET_LOCATION(libGLES "Qt5::Gui_GLESv2")
FETCH_TARGET_LOCATION(libQuickControls2 "Qt5::QuickControls2")
INSTALL(FILES ${libQuickControls2} DESTINATION . COMPONENT Runtime)
INSTALL(FILES ${libEgl} DESTINATION . COMPONENT Runtime)
INSTALL(FILES ${libGLES} DESTINATION . COMPONENT Runtime)

IF(TARGET Qt5::Gui_EGL AND TARGET Qt5::Gui_GLESv2)
FETCH_TARGET_LOCATION(libEgl "Qt5::Gui_EGL")
FETCH_TARGET_LOCATION(libGLES "Qt5::Gui_GLESv2")
INSTALL(FILES ${libEgl} DESTINATION . COMPONENT Runtime)
INSTALL(FILES ${libGLES} DESTINATION . COMPONENT Runtime)
ENDIF()
ENDIF()
FETCH_TARGET_LOCATION(libSvg "Qt5::Svg")
FETCH_TARGET_LOCATION(pluginSvg "Qt5::QSvgPlugin")
Expand Down Expand Up @@ -192,16 +195,16 @@ ELSEIF(ANDROID)
SET(RESOURCES_IMG_ANDROID_DIR ${RESOURCES_DIR}/images/android)
IF(BUILD_PREVIEW)
SET(ANDROID_LAUNCHER_ICON "npa_preview.png")
SET(ANDROID_PACKAGE_NAME "com.governikus.ausweisapp2.dev")
SET(ANDROID_PACKAGE_NAME "${BUNDLE_IDENTIFIER}.dev")
ELSEIF(IS_DEVELOPER_VERSION)
SET(ANDROID_LAUNCHER_ICON "npa_beta.png")
SET(ANDROID_PACKAGE_NAME "com.governikus.ausweisapp2")
SET(ANDROID_PACKAGE_NAME "${BUNDLE_IDENTIFIER}")
ELSE()
SET(ANDROID_LAUNCHER_ICON "npa.png")
SET(ANDROID_PACKAGE_NAME "com.governikus.ausweisapp2")
SET(ANDROID_PACKAGE_NAME "${BUNDLE_IDENTIFIER}")
ENDIF()

IF(ANDROID_BUILD_AAR)
IF(INTEGRATED_SDK)
SET(ANDROID_MANIFEST AndroidManifest.xml.aar.in)
FOREACH(entry network/WifiInfo ui/aidl/AidlBinder activation/intent/AusweisApp2Service)
SET(_java_file "${SRC_DIR}/${entry}.java")
Expand Down Expand Up @@ -237,7 +240,7 @@ ELSEIF(ANDROID)
ENDIF()
CONFIGURE_FILE(${PACKAGING_DIR}/android/${ANDROID_MANIFEST} ${ANDROID_PACKAGE_SRC_DIR}/AndroidManifest.xml @ONLY)
CONFIGURE_FILE(${PACKAGING_DIR}/android/backup_rules.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/backup_rules.xml COPYONLY)
IF(NOT ANDROID_BUILD_AAR)
IF(NOT INTEGRATED_SDK)
CONFIGURE_FILE(${PACKAGING_DIR}/android/fileprovider.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/fileprovider.xml COPYONLY)
ENDIF()

Expand All @@ -260,27 +263,22 @@ ELSEIF(ANDROID)
SET(ANDROID_DEPLOYMENT_SETTINGS ${PROJECT_BINARY_DIR}/libAusweisApp2.so-deployment-settings.json CACHE INTERNAL "apk deployment" FORCE)
CONFIGURE_FILE(${PACKAGING_DIR}/android/libAusweisApp2.so-deployment-settings.json.in ${ANDROID_DEPLOYMENT_SETTINGS} @ONLY)

SET(TRANSLATION_DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/assets/translations)
SET(TRANSLATION_DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/assets/${TRANSLATION_DESTINATION})
SET(DEFAULT_FILE_DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/assets)

ELSEIF(UNIX)
IF(BUILD_SHARED_LIBS)
SET(CMAKE_INSTALL_RPATH "\$ORIGIN")
ENDIF()

SET(DEFAULT_FILE_DESTINATION bin)
INSTALL(TARGETS AusweisApp DESTINATION ${DEFAULT_FILE_DESTINATION} COMPONENT Application)
INSTALL(CODE
"
${DEPENDENCY_CHECK}
${SEARCH_ADDITIONAL_DIRS}
INCLUDE(BundleUtilities)
FIXUP_BUNDLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DEFAULT_FILE_DESTINATION}/${PROJECT_NAME}\" \"\" \"\${ADDITIONAL_DIRS}\")
" COMPONENT Runtime)

CONFIGURE_FILE(${PACKAGING_DIR}/linux/AusweisApp2.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/AusweisApp2.desktop @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/AusweisApp2.desktop DESTINATION share/applications COMPONENT Application)
#INSTALL(FILES ${RESOURCES_DIR}/images/AusweisApp2.svg DESTINATION share/icons/hicolor/scalable/apps COMPONENT Application)
SET(DEFAULT_FILE_DESTINATION ${CMAKE_INSTALL_DATADIR}/${VENDOR}/AusweisApp2)
SET(TRANSLATION_DESTINATION ${DEFAULT_FILE_DESTINATION}/${TRANSLATION_DESTINATION})
INSTALL(TARGETS AusweisApp DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Application)
CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.metainfo.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml @ONLY)
CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo COMPONENT Application)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT Application)
INSTALL(FILES ${RESOURCES_DIR}/images/npa.svg DESTINATION ${DEFAULT_FILE_DESTINATION} COMPONENT Application)
ENDIF()


Expand All @@ -304,35 +302,35 @@ IF(LINUX OR WIN32 OR MAC)
ENDIF()
ENDIF()

IF(WIN32)
IF(SIGNTOOL_CMD)
CONFIGURE_FILE(${CMAKE_DIR}/SignFiles.cmake.in ${CMAKE_BINARY_DIR}/SignFiles.cmake @ONLY)
INSTALL(CODE
"
EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" -DSIGN_EXT=*.exe -P \"${CMAKE_BINARY_DIR}/SignFiles.cmake\" WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DEFAULT_FILE_DESTINATION}\")
" COMPONENT Application)
ENDIF()
ENDIF()



IF(LINUX)
INSTALL(FILES ${QM_FILES} DESTINATION ${TRANSLATION_DESTINATION} COMPONENT Translations)
ELSEIF(NOT ANDROID_BUILD_AAR)
ELSEIF(NOT INTEGRATED_SDK)
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/translations/ DESTINATION ${TRANSLATION_DESTINATION} COMPONENT Translations)
ENDIF()

IF(NOT ANDROID_BUILD_AAR)
IF(NOT INTEGRATED_SDK)
# resources file
INSTALL(FILES ${RCC} DESTINATION ${DEFAULT_FILE_DESTINATION} COMPONENT Runtime)
ENDIF()

# qt qml plugins
IF(DESKTOP AND TARGET Qt5::Qml)
IF((WIN32 OR MAC) AND TARGET Qt5::Qml)
FOREACH(entry QtQuick QtQuick.2 QtQml QtGraphicalEffects Qt)
INSTALL(DIRECTORY ${QT_HOST_PREFIX}/qml/${entry} DESTINATION ${DEFAULT_FILE_DESTINATION}/qml COMPONENT Runtime PATTERN "*.dylib" EXCLUDE)
ENDFOREACH()
ENDIF()

# secure storage file
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.json DESTINATION ${DEFAULT_FILE_DESTINATION} COMPONENT Runtime)


IF(WIN32)
IF(SIGNTOOL_CMD)
CONFIGURE_FILE(${CMAKE_DIR}/SignFiles.cmake.in ${CMAKE_BINARY_DIR}/SignFiles.cmake @ONLY)
INSTALL(CODE
"
EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" -DSIGN_EXT=*.exe -P \"${CMAKE_BINARY_DIR}/SignFiles.cmake\" WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DEFAULT_FILE_DESTINATION}\")
" COMPONENT Application)
ENDIF()
ENDIF()
11 changes: 5 additions & 6 deletions cmake/Libraries.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FIND_PACKAGE(Qt5Svg ${MIN_QT_VERSION} REQUIRED)
FIND_PACKAGE(Qt5LinguistTools ${MIN_QT_VERSION} REQUIRED)
FIND_PACKAGE(Qt5WebSockets ${MIN_QT_VERSION} REQUIRED)

IF(NOT ANDROID_BUILD_AAR)
IF(NOT INTEGRATED_SDK)
FIND_PACKAGE(Qt5Qml ${MIN_QT_VERSION} REQUIRED)
FIND_PACKAGE(Qt5Quick ${MIN_QT_VERSION} REQUIRED)
FIND_PACKAGE(Qt5QuickControls2 ${MIN_QT_VERSION} REQUIRED)
ENDIF()

IF(DESKTOP)
IF(DESKTOP AND NOT INTEGRATED_SDK)
FIND_PACKAGE(Qt5Widgets ${MIN_QT_VERSION} REQUIRED)

IF(WIN32)
Expand Down Expand Up @@ -96,7 +96,6 @@ ELSEIF(IOS)
FIND_LIBRARY(IOS_CORETEXT CoreText)
FIND_LIBRARY(IOS_COREGRAPHICS CoreGraphics)
FIND_LIBRARY(IOS_SECURITY Security)
FIND_LIBRARY(IOS_SYSTEMCONFIGURATION SystemConfiguration)
FIND_LIBRARY(IOS_AUDIOTOOLBOX AudioToolbox)
FIND_LIBRARY(IOS_IMAGEIO ImageIO)
FIND_LIBRARY(IOS_CORENFC CoreNFC)
Expand All @@ -121,7 +120,7 @@ ELSEIF(UNIX)
ENDIF()


IF("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
FIND_PACKAGE(Qt5Test ${MIN_QT_VERSION} REQUIRED)
FIND_PACKAGE(Qt5QuickTest ${MIN_QT_VERSION} REQUIRED)
IF(BUILD_TESTING)
FIND_PACKAGE(Qt5Test ${MIN_QT_VERSION})
FIND_PACKAGE(Qt5QuickTest ${MIN_QT_VERSION})
ENDIF()
1 change: 1 addition & 0 deletions cmake/Messages.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ MESSAGE(STATUS "CMAKE_SYSROOT_LINK: ${CMAKE_SYSROOT_LINK}")
MESSAGE(STATUS "CMAKE_SYSROOT_COMPILE: ${CMAKE_SYSROOT_COMPILE}")
IF(APPLE)
MESSAGE(STATUS "CMAKE_OSX_SYSROOT: ${CMAKE_OSX_SYSROOT}")
MESSAGE(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
ENDIF()
MESSAGE(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
MESSAGE(STATUS "CMAKE_CXX_SIMULATE_ID: ${CMAKE_CXX_SIMULATE_ID}")
Expand Down
Loading

0 comments on commit 23952d6

Please sign in to comment.