Skip to content

Commit ed75a18

Browse files
metsmametsma
authored
Remove cmake submodule (#1316)
IB-8354 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent d4f9dc2 commit ed75a18

File tree

14 files changed

+103
-51
lines changed

14 files changed

+103
-51
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "cmake"]
2-
path = cmake
3-
url = ../cmake
41
[submodule "common"]
52
path = common
63
url = ../qt-common

‎CMakeLists.txt‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
cmake_minimum_required(VERSION 3.22)
2-
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/VersionInfo.cmake)
3-
message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?")
2+
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/common/CMakeLists.txt)
3+
message(FATAL_ERROR "common submodule directory empty, did you 'git clone --recursive'?")
44
endif()
55
project(qdigidoc4 VERSION 4.8.0)
66

7-
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
8-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
9-
set(CMAKE_AUTOMOC ON)
10-
11-
include( GNUInstallDirs )
12-
include( VersionInfo )
13-
14-
find_package(libdigidocpp 4.2.0 REQUIRED HINTS /Library)
15-
message("-- Found libdigidocpp: ${libdigidocpp_DIR} (found version \"${libdigidocpp_VERSION}\")")
16-
find_package( LDAP REQUIRED )
17-
find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport SvgWidgets LinguistTools)
18-
find_package(FlatBuffers CONFIG REQUIRED NAMES FlatBuffers Flatbuffers)
19-
find_package(ZLIB REQUIRED)
7+
macro(SET_ENV NAME DEF)
8+
if(DEFINED ENV{${NAME}})
9+
set(${NAME} $ENV{${NAME}} ${ARGN})
10+
else()
11+
set(${NAME} ${DEF} ${ARGN})
12+
endif()
13+
endmacro()
2014

15+
set_env(BUILD_NUMBER 0)
2116
set_env( TSL_URL "https://ec.europa.eu/tools/lotl/eu-lotl.xml" CACHE STRING "TSL trust list primary URL" )
2217
set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list include in binary" )
23-
set_env(CDOC2_GET_URL "https://cdoc2-keyserver-get" CACHE STRING "CDoc 2.0 Key Server get URL")
24-
set_env(CDOC2_POST_URL "https://cdoc2-keyserver-post" CACHE STRING "CDoc 2.0 Key Server post URL")
18+
set_env(CDOC2_GET_URL "https://cdoc2.id.ee:8444" CACHE STRING "CDoc 2.0 Key Server get URL")
19+
set_env(CDOC2_POST_URL "https://cdoc2.id.ee:8443" CACHE STRING "CDoc 2.0 Key Server post URL")
2520
set_env( MOBILEID_URL "https://dd-mid.ria.ee/mid-api" CACHE STRING "URL for Mobile-ID" )
2621
set_env( SMARTID_URL "https://dd-sid.ria.ee/v1" CACHE STRING "URL for Smart-ID" )
22+
set(VERSION ${PROJECT_VERSION}.${BUILD_NUMBER})
23+
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
24+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
25+
set(CMAKE_AUTOMOC ON)
26+
set(CMAKE_C_VISIBILITY_PRESET hidden)
27+
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
28+
set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
2729
set(CMAKE_CXX_STANDARD 20)
2830
set(CMAKE_CXX_STANDARD_REQUIRED YES)
2931
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
@@ -40,6 +42,15 @@ set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
4042
set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
4143
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
4244
include(CPack)
45+
include(GNUInstallDirs)
46+
47+
find_package(libdigidocpp 4.2.0 REQUIRED HINTS /Library)
48+
message("-- Found libdigidocpp: ${libdigidocpp_DIR} (found version \"${libdigidocpp_VERSION}\")")
49+
find_package(LDAP REQUIRED)
50+
find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport SvgWidgets LinguistTools)
51+
find_package(FlatBuffers CONFIG REQUIRED NAMES FlatBuffers Flatbuffers)
52+
find_package(ZLIB REQUIRED)
53+
4354
if(APPLE)
4455
add_subdirectory(extensions/DigiDocQL)
4556
elseif(WIN32)

‎RELEASE-NOTES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
DigiDoc4 version [4.7.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.7.0) release notes
2+
--------------------------------------
3+
- Code, Text and translation improvements and updates
4+
5+
[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.6.0...v4.7.0)
6+
17
DigiDoc4 version [4.6.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.6.0) release notes
28
--------------------------------------
39
- Code, Text and translation improvements and updates

‎client/Application.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,7 @@ Application::Application( int &argc, char **argv )
304304
, d(new Private)
305305
{
306306
setApplicationName(QStringLiteral("qdigidoc4"));
307-
setApplicationVersion(QStringLiteral("%1.%2.%3.%4")
308-
.arg( MAJOR_VER ).arg( MINOR_VER ).arg( RELEASE_VER ).arg( BUILD_VER ) );
307+
setApplicationVersion(QStringLiteral(VERSION_STR));
309308
setOrganizationDomain(QStringLiteral("ria.ee"));
310309
setOrganizationName(QStringLiteral("RIA"));
311310
setWindowIcon(QIcon(QStringLiteral(":/images/Icon.svg")));

‎client/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
124124
AUTORCC ON
125125
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/Info.plist.cmake
126126
MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}
127+
MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2025 Estonian Information System Authority"
128+
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
129+
MACOSX_BUNDLE_BUNDLE_VERSION ${BUILD_NUMBER}
130+
MACOSX_BUNDLE_ICON_FILE Icon.icns
127131
MACOSX_BUNDLE_GUI_IDENTIFIER "ee.ria.${PROJECT_NAME}"
128132
)
129133
target_compile_definitions(${PROJECT_NAME} PRIVATE
@@ -132,6 +136,8 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
132136
MOBILEID_URL="${MOBILEID_URL}"
133137
SMARTID_URL="${SMARTID_URL}"
134138
BUILD_DATE="${BUILD_DATE}"
139+
VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_NUMBER}
140+
VERSION_STR="${VERSION}"
135141
)
136142

137143
foreach(SCHEMA ${SCHEMAS})

‎client/ee.ria.qdigidoc4.metainfo.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@
5353
<binary>qdigidoc4</binary>
5454
</provides>
5555
<releases>
56+
<release version="4.7.0" date="2025-01-02">
57+
<description>
58+
<ul>
59+
<li>Code, Text and translation improvements and updates</li>
60+
</ul>
61+
</description>
62+
</release>
63+
<release version="4.6.0" date="2024-10-08">
64+
<description>
65+
<ul>
66+
<li>Code, Text and translation improvements and updates</li>
67+
</ul>
68+
</description>
69+
</release>
5670
<release version="4.5.0" date="2024-04-16">
5771
<description>
5872
<ul>

‎client/main.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ int main( int argc, char *argv[] )
3333
{
3434
QCoreApplication qtApp( argc, argv );
3535
qtApp.setApplicationName(QStringLiteral("qdigidoc4"));
36-
qtApp.setApplicationVersion(QStringLiteral("%1.%2.%3.%4")
37-
.arg(MAJOR_VER).arg(MINOR_VER).arg(RELEASE_VER).arg(BUILD_VER));
36+
qtApp.setApplicationVersion(QStringLiteral(VERSION_STR));
3837
qtApp.setOrganizationDomain(QStringLiteral("ria.ee"));
3938
qtApp.setOrganizationName(QStringLiteral("RIA"));
4039

‎client/qdigidoc4.rc‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#include <winver.h>
22

3-
#define VER_STR_HELPER(x) #x
4-
#define VER_STR(x) VER_STR_HELPER(x)
5-
63
VS_VERSION_INFO VERSIONINFO
7-
FILEVERSION MAJOR_VER,MINOR_VER,RELEASE_VER,BUILD_VER
8-
PRODUCTVERSION MAJOR_VER,MINOR_VER,RELEASE_VER,BUILD_VER
4+
FILEVERSION VERSION
5+
PRODUCTVERSION VERSION
96
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
107
#ifdef _DEBUG
118
FILEFLAGS VS_FF_DEBUG
@@ -22,23 +19,23 @@ BEGIN
2219
BEGIN
2320
VALUE "CompanyName", "RIA"
2421
VALUE "FileDescription", "DigiDoc4"
25-
VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
22+
VALUE "FileVersion", VERSION_STR
2623
VALUE "InternalName", "qdigidoc4"
27-
VALUE "LegalCopyright", "Copyright (C) 2017-2024 Estonian Information System Authority"
24+
VALUE "LegalCopyright", "Copyright (C) 2017-2025 Estonian Information System Authority"
2825
VALUE "OriginalFilename", "qdigidoc4.exe"
2926
VALUE "ProductName", "DigiDoc4"
30-
VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
27+
VALUE "ProductVersion", VERSION_STR
3128
END
3229
BLOCK "042504B0"
3330
BEGIN
3431
VALUE "CompanyName", "RIA"
3532
VALUE "FileDescription", "DigiDoc4"
36-
VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
33+
VALUE "FileVersion", VERSION_STR
3734
VALUE "InternalName", "qdigidoc4"
38-
VALUE "LegalCopyright", "Copyright (C) 2017-2024 Riigi Infosüsteemi Amet"
35+
VALUE "LegalCopyright", "Copyright (C) 2017-2025 Riigi Infosüsteemi Amet"
3936
VALUE "OriginalFilename", "qdigidoc4.exe"
4037
VALUE "ProductName", "DigiDoc4"
41-
VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
38+
VALUE "ProductVersion", VERSION_STR
4239
END
4340
END
4441
BLOCK "VarFileInfo"

‎cmake‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎cmake/modules/FindLDAP.cmake‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# - Try to find the LDAP client libraries
2+
# Once done this will define
3+
#
4+
# LDAP_FOUND - system has libldap
5+
# LDAP_INCLUDE_DIR - the ldap include directory
6+
# LDAP_LIBRARIES - libldap + liblber library
7+
8+
set(CMAKE_FIND_FRAMEWORK LAST)
9+
find_path(LDAP_INCLUDE_DIR ldap.h Winldap.h)
10+
find_library(LDAP_LIBRARY NAMES ldap Wldap32)
11+
find_library(LBER_LIBRARY NAMES lber)
12+
13+
include(FindPackageHandleStandardArgs)
14+
find_package_handle_standard_args(LDAP DEFAULT_MSG LDAP_LIBRARY)
15+
16+
if(LDAP_FOUND)
17+
if(LBER_LIBRARY)
18+
set(LDAP_LIBRARIES ${LDAP_LIBRARY} ${LBER_LIBRARY})
19+
else()
20+
set(LDAP_LIBRARIES ${LDAP_LIBRARY})
21+
endif()
22+
endif()
23+
24+
mark_as_advanced(LDAP_INCLUDE_DIR LDAP_LIBRARY LBER_LIBRARY)

0 commit comments

Comments
 (0)