Skip to content

Commit

Permalink
Add revision: v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
GovernikusAusweisApp2 committed Feb 29, 2024
1 parent 5b6ff95 commit 8973008
Show file tree
Hide file tree
Showing 1,865 changed files with 15,284 additions and 13,658 deletions.
1 change: 0 additions & 1 deletion CMakeGraphVizOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ set(GRAPHVIZ_EXTERNAL_LIBS OFF)
set(GRAPHVIZ_EXECUTABLES ON)
set(GRAPHVIZ_GENERATE_PER_TARGET OFF)
set(GRAPHVIZ_GENERATE_DEPENDERS OFF)
set(GRAPHVIZ_GRAPH_NAME AusweisApp2)
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ else()
endif()

if(UNIX AND NOT IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0 CACHE STRING "Required macOS version")
set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0 CACHE STRING "Required macOS version")
endif()

project(AusweisApp VERSION 2.0.3 LANGUAGES ${LANGUAGES})
project(AusweisApp VERSION 2.1.0 LANGUAGES ${LANGUAGES})

# Set TWEAK if not defined in PROJECT_VERSION above to
# have a valid tweak version without propagating it
Expand Down Expand Up @@ -46,10 +46,8 @@ include(Helper)
if(NOT VENDOR)
if(EXISTS "${CMAKE_DIR}/Vendor.internal.cmake")
include(Vendor.internal)
elseif(LINUX OR BSD)
set(VENDOR "") # Qt uses Organization for paths
else()
set(VENDOR AusweisApp_CE) # CommunityEdition
set(VENDOR "") # Qt uses Organization for paths
endif()
endif()
if(VENDOR MATCHES "Governikus")
Expand All @@ -74,7 +72,7 @@ if(ANDROID)
message(STATUS "ANDROID_VERSION_CODE: ${ANDROID_VERSION_CODE}")
endif()

if(IOS)
if(IOS OR MAC)
if(NOT USE_DISTRIBUTION_PROFILE)
set(USE_DISTRIBUTION_PROFILE false)
endif()
Expand Down
266 changes: 10 additions & 256 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -1,263 +1,17 @@
{
"version": 3,
"version": 6,
"cmakeMinimumRequired": {
"major": 3,
"minor": 21,
"minor": 25,
"patch": 0
},
"configurePresets": [
{
"name": "ci",
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceParentDir}/build",
"cacheVariables": {
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
}
},
{
"name": "ci-with-libs",
"hidden": true,
"inherits": "ci",
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceParentDir}/libs/build/dist"
}
},
{
"name": "ci-win",
"inherits": "ci-with-libs"
},
{
"name": "ci-win-release",
"inherits": "ci-win",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"WIN_SIGN_KEYSTORE": "$env{WIN_SIGN_KEYSTORE}",
"WIN_SIGN_KEYSTORE_PSW": "$env{WIN_SIGN_KEYSTORE_PSW}",
"WIN_SIGN_SUBJECT_NAME": "$env{WIN_SIGN_SUBJECT_NAME}"
}
},
{
"name": "ci-win-debug",
"inherits": "ci-win",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "DEBUG",
"WIN_SIGN_KEYSTORE": "$env{WIN_SIGN_KEYSTORE}",
"WIN_SIGN_KEYSTORE_PSW": "$env{WIN_SIGN_KEYSTORE_PSW}",
"WIN_SIGN_SUBJECT_NAME": "$env{WIN_SIGN_SUBJECT_NAME}"
}
},
{
"name": "ci-macos",
"inherits": "ci-with-libs",
"generator": "Xcode",
"cacheVariables": {
"BUILD_SHARED_LIBS": "ON",
"SANITIZER": "ON"
}
},
{
"name": "ci-macos-release",
"inherits": "ci-with-libs",
"generator": "Xcode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
},
{
"name": "ci-macos-integrated",
"inherits": "ci-with-libs",
"cacheVariables": {
"INTEGRATED_SDK": "ON",
"SANITIZER": "ON"
}
},
{
"name": "ci-linux",
"inherits": "ci-with-libs",
"cacheVariables": {
"COVERAGE": "ON",
"BUILD_SHARED_LIBS": "ON",
"SANITIZER": "ON"
}
},
{
"name": "ci-integrated",
"inherits": "ci-linux",
"cacheVariables": {
"INTEGRATED_SDK": "ON",
"CMAKE_CXX_COMPILER": "clazy"
}
},
{
"name": "ci-bsd",
"inherits": "ci-linux"
},
{
"name": "ci-ios",
"inherits": "ci-with-libs",
"generator": "Xcode",
"toolchainFile": "${sourceDir}/cmake/iOS.toolchain.cmake",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
},
{
"name": "ci-ios-framework",
"inherits": "ci-ios",
"cacheVariables": {
"INTEGRATED_SDK": "ON"
}
},
{
"name": "ci-ios-framework-simulator",
"inherits": "ci-ios-framework",
"generator": "Xcode",
"cacheVariables": {
"CMAKE_OSX_SYSROOT": "iphonesimulator",
"CMAKE_OSX_ARCHITECTURES": "x86_64"
}
},
{
"name": "ci-ios-framework-simulator-arm64",
"inherits": "ci-ios-framework-simulator",
"cacheVariables": {
"CMAKE_OSX_ARCHITECTURES": "arm64"
}
},
{
"name": "ci-android",
"hidden": true,
"inherits": "ci-with-libs",
"toolchainFile": "${sourceDir}/cmake/android.toolchain.cmake"
},
{
"name": "ci-android-apk-release",
"inherits": "ci-android",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"APK_SIGN_KEYSTORE": "$env{APK_SIGN_KEYSTORE}",
"APK_SIGN_KEYSTORE_ALIAS": "$env{APK_SIGN_KEYSTORE_ALIAS}",
"APK_SIGN_KEYSTORE_PSW": "$env{APK_SIGN_KEYSTORE_PSW}"
}
},
{
"name": "ci-android-apk",
"inherits": "ci-android",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"APK_SIGN_KEYSTORE": "$env{APK_SIGN_KEYSTORE_DEV}",
"APK_SIGN_KEYSTORE_ALIAS": "$env{APK_SIGN_KEYSTORE_ALIAS_DEV}",
"APK_SIGN_KEYSTORE_PSW": "$env{APK_SIGN_KEYSTORE_PSW_DEV}"
}
},
{
"name": "ci-android-apk-review",
"inherits": "ci-android",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "DEBUG"
}
},
{
"name": "ci-android-aar",
"inherits": "ci-android",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"INTEGRATED_SDK": "ON"
}
},
{
"name": "ci-android-aar-review",
"inherits": "ci-android",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "DEBUG",
"INTEGRATED_SDK": "ON"
}
},
{
"name": "ci-translations",
"inherits": "ci-with-libs",
"cacheVariables": {
"UPDATE_TRANSLATIONS": "ON",
"UPDATE_TRANSLATIONS_NO_OBSOLETE": "ON"
}
},
{
"name": "ci-tools",
"inherits": "ci",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RELEASE",
"tools.only": "ON",
"CMAKE_CXX_COMPILER_LAUNCHER": null
}
},
{
"name": "ci-tools-with-libs",
"inherits": "ci-tools",
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceParentDir}/libs/build/dist"
}
},
{
"name": "base",
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceParentDir}/AusweisApp2-build/${presetName}",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
}
},
{
"name": "default",
"inherits": "base",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "DEBUG"
}
},
{
"name": "integrated",
"inherits": "base",
"cacheVariables": {
"INTEGRATED_SDK": "ON"
}
},
{
"name": "container",
"inherits": "base",
"cacheVariables": {
"CONTAINER_SDK": "ON"
}
},
{
"name": "apk",
"inherits": "default",
"toolchainFile": "${sourceDir}/cmake/android.toolchain.cmake",
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceParentDir}/AusweisApp2-build/libs/android/dist"
}
},
{
"name": "aar",
"inherits": "apk",
"cacheVariables": {
"INTEGRATED_SDK": "ON"
}
}
],
"buildPresets": [
{
"name": "default",
"configurePreset": "default"
}
],
"testPresets": [
{
"name": "default",
"configurePreset": "default",
"output": {
"outputOnFailure": true
}
}
"include": [
"presets/ci-android.json",
"presets/ci-bsd.json",
"presets/ci-linux.json",
"presets/ci-macOS.json",
"presets/ci-iOS.json",
"presets/ci-tools.json",
"presets/ci-windows.json"
]
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ aufgenommen und mit dem nächsten Major-Release veröffentlicht. In der Zwischen
wird die Änderung ebenfalls in dem ``community`` branch angenommen und beim
offiziellen Release synchronisiert.

.. _`Repository`: https://github.com/Governikus/AusweisApp2
.. _`Repository`: https://github.com/Governikus/AusweisApp



Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ALPINE_VERSION=3.18
ARG ALPINE_VERSION=3.19

FROM alpine:$ALPINE_VERSION as builder
# Install development stuff
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.officially.txt
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin

OpenSSL
Lizenz: Apache 2.0
Version: 3.1.4
Version: 3.1.5
Adresse: https://www.openssl.org/

Qt
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin

OpenSSL
Lizenz: Apache 2.0
Version: 3.1.4
Version: 3.1.5
Adresse: https://www.openssl.org/

Qt
Expand Down
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ Bei Android ist zu beachten, dass ein CMAKE_TOOLCHAIN_FILE angegeben werden muss

Unter dem Ordner "./dist/bin" ist nun ein "AusweisApp...apk" erstellt worden.

Sofern der Parameter *CMAKE_BUILD_TYPE* auf RELEASE gesetzt wird, sind folgende CMake
Parameter notwendig um das APK zu signieren.
Sofern der Parameter *CMAKE_BUILD_TYPE* auf RELEASE gesetzt wird, sind folgende
Umgebungsvariablen notwendig um das APK zu signieren.

::

-DAPK_SIGN_KEYSTORE=/home/governikus/AusweisApp.apk.keystore.jks
-DAPK_SIGN_KEYSTORE_ALIAS=ausweisapp
-DAPK_SIGN_KEYSTORE_PSW=123456
QT_ANDROID_KEYSTORE_PATH=/home/governikus/AusweisApp.apk.keystore.jks
QT_ANDROID_KEYSTORE_ALIAS=ausweisapp
QT_ANDROID_KEYSTORE_STORE_PASS=123456

Wie schon bei der Toolchain wird standardmäßig die Architektur "armeabi-v7a" verwendet.
Dies kann mittels CMake Parameter "-DCMAKE_ANDROID_ARCH_ABI=x86" verändert werden.
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ on_finish:
- cd "%APPVEYOR_BUILD_FOLDER%"

- ps: |
$version = Select-String -Path .\CMakeLists.txt -Pattern "AusweisApp2 VERSION ([0-9.]+)" | % { $_.Matches[0].Groups[1].Value }
$version = Select-String -Path .\CMakeLists.txt -Pattern "AusweisApp VERSION ([0-9.]+)" | % { $_.Matches[0].Groups[1].Value }
Update-AppveyorBuild -Version "$version-$env:APPVEYOR_BUILD_NUMBER"
6 changes: 1 addition & 5 deletions cmake/Appcast.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(MAC OR LINUX OR WIN32)
if(NOT "${_system}" STREQUAL "src")
file(READ ${PACKAGING_DIR}/updater/Appcast.item.json.in item)

string(REPLACE "AusweisApp2-" "" APPCAST_FILE_VERSION ${file})
string(REPLACE "AusweisApp-" "" APPCAST_FILE_VERSION ${file})
string(REPLACE ".dmg" "" APPCAST_FILE_VERSION ${APPCAST_FILE_VERSION})
string(REPLACE ".msi" "" APPCAST_FILE_VERSION ${APPCAST_FILE_VERSION})

Expand All @@ -43,10 +43,6 @@ if(MAC OR LINUX OR WIN32)
file(GLOB MSI_FILES ${PROJECT_BINARY_DIR}/*.msi)
file(GLOB TAR_GZ_FILES ${PROJECT_BINARY_DIR}/*.tar.gz)

if(DMG_FILES)
ADD_APPCAST_FILE("${DMG_FILES}" "mac" "${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()

if(MSI_FILES)
ADD_APPCAST_FILE("${MSI_FILES}" "win" "10")
endif()
Expand Down
Loading

0 comments on commit 8973008

Please sign in to comment.