Skip to content

Commit c43bd94

Browse files
metsmametsma
authored
Cleanup scripts and fix signing (#606)
IB-8144 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 2b5db85 commit c43bd94

6 files changed

Lines changed: 106 additions & 103 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ permissions:
55
env:
66
BUILD_NUMBER: ${{ github.run_number }}
77
CMAKE_BUILD_PARALLEL_LEVEL: 4
8+
UBUNTU_DEPS: cmake xsdcxx libxml-security-c-dev libxml2-dev zlib1g-dev
89
jobs:
910
macos:
1011
name: Build on macOS for ${{ matrix.target }}
@@ -119,7 +120,7 @@ jobs:
119120
DEBEMAIL: github-actions@github.com
120121
steps:
121122
- name: Install dependencies
122-
run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper cmake xsdcxx libxml-security-c-dev libxml2-dev zlib1g-dev doxygen swig openjdk-11-jdk-headless libpython3-dev python3-setuptools libboost-test-dev lintian
123+
run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper ${UBUNTU_DEPS} doxygen swig openjdk-11-jdk-headless libpython3-dev python3-setuptools libboost-test-dev lintian
123124
- name: Checkout
124125
uses: actions/checkout@v4
125126
with:
@@ -210,7 +211,7 @@ jobs:
210211
with:
211212
submodules: recursive
212213
- name: Install dependencies
213-
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake xsdcxx libxml-security-c-dev libxml2-dev zlib1g-dev doxygen
214+
run: sudo apt update -qq && sudo apt install --no-install-recommends -y doxygen ${UBUNTU_DEPS}
214215
- name: Build docs
215216
run: |
216217
cmake -B build -S .
@@ -234,7 +235,7 @@ jobs:
234235
with:
235236
submodules: recursive
236237
- name: Install dependencies
237-
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake xsdcxx libxml-security-c-dev libxml2-dev zlib1g-dev curl ca-certificates
238+
run: sudo apt update -qq && sudo apt install --no-install-recommends -y curl ca-certificates ${UBUNTU_DEPS}
238239
- name: Download Coverity Build Tool
239240
run: |
240241
curl --silent --data "token=$TOKEN&project=$PROJECTNAME" -o cov-analysis-linux64.tar.gz https://scan.coverity.com/download/cxx/linux64
@@ -268,7 +269,7 @@ jobs:
268269
with:
269270
submodules: recursive
270271
- name: Install dependencies
271-
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake xsdcxx libxml-security-c-dev libxml2-dev zlib1g-dev curl ca-certificates
272+
run: sudo apt update -qq && sudo apt install --no-install-recommends -y ${UBUNTU_DEPS}
272273
- name: Initialize CodeQL
273274
uses: github/codeql-action/init@v3
274275
with:

‎CMakeLists.txt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ if(APPLE)
4343
set(FRAMEWORK_DESTINATION /Library/Frameworks CACHE PATH "Mac OS X Framework install destination")
4444
endif()
4545

46-
find_package(Doxygen)
4746
find_package(OpenSSL 1.1.1 REQUIRED)
4847
find_package(PKCS11)
4948
#find_package(PoDoFo)
@@ -52,16 +51,19 @@ find_package(LibXml2 REQUIRED)
5251
find_package(XmlSecurityC REQUIRED)
5352
find_package(XSD 4.0 REQUIRED)
5453
find_package(ZLIB REQUIRED)
55-
find_package(MiniZip 1 QUIET) # version range (0...<2.0.0) requires CMake>=3.19
54+
find_package(MiniZip 1 QUIET)
5655
if(UNIX AND NOT APPLE)
5756
find_package(PkgConfig)
5857
pkg_check_modules(MINIZIP minizip IMPORTED_TARGET)
5958
endif()
6059
find_package(SWIG)
61-
find_package(JNI)
62-
find_package(Python3 COMPONENTS Interpreter Development)
60+
if(SWIG_FOUND)
61+
find_package(JNI)
62+
find_package(Python3 COMPONENTS Interpreter Development)
63+
endif()
6364

64-
if( DOXYGEN_FOUND )
65+
find_package(Doxygen)
66+
if(TARGET Doxygen::doxygen)
6567
configure_file( ${CMAKE_SOURCE_DIR}/etc/Doxyfile.in Doxyfile @ONLY )
6668
add_custom_target( docs ALL
6769
Doxygen::doxygen Doxyfile
@@ -78,5 +80,9 @@ endif()
7880

7981
enable_testing()
8082
add_subdirectory(src)
81-
add_subdirectory(test)
8283
add_subdirectory(examples)
84+
85+
find_package( Boost COMPONENTS unit_test_framework )
86+
if(TARGET Boost::unit_test_framework)
87+
add_subdirectory(test)
88+
endif()

‎build-library.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ case "$@" in
3939
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
4040
-DANDROID_PLATFORM=30 \
4141
-DANDROID_ABI=${ARCH} \
42-
-DBoost_INCLUDE_DIR=NOTFOUND \
43-
-DDOXYGEN_EXECUTABLE=NOTFOUND \
42+
-DCMAKE_DISABLE_FIND_PACKAGE_Boost=YES \
43+
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=YES \
4444
-DBUILD_TOOLS=NO \
4545
-DBUILD_SHARED_LIBS=NO"
4646
;;
@@ -72,9 +72,9 @@ case "$@" in
7272
TARGET_PATH=/Library/libdigidocpp.${TARGET}
7373
CMAKEARGS="${CMAKEARGS} \
7474
-DCMAKE_OSX_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET} \
75-
-DSWIG_EXECUTABLE=NOTFOUND \
76-
-DBoost_INCLUDE_DIR=NOTFOUND \
77-
-DDOXYGEN_EXECUTABLE=NOTFOUND \
75+
-DCMAKE_DISABLE_FIND_PACKAGE_SWIG=YES \
76+
-DCMAKE_DISABLE_FIND_PACKAGE_Boost=YES \
77+
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=YES \
7878
-DFRAMEWORK_DESTINATION=${TARGET_PATH}/lib
7979
-DBUILD_TOOLS=NO"
8080
;;

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ foreach($type in @("Debug", "RelWithDebInfo")) {
5959
$libdigidocpp\libdigidocpp.wxs
6060

6161
if($sign) {
62-
signtool.exe sign /a /v /s MY /n "$sign" /fd SHA256 /du http://installer.id.ee `
62+
& $vcvars $platform "&&" signtool.exe sign /a /v /s MY /n "$sign" /fd SHA256 /du http://installer.id.ee `
6363
/tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 "$msi_name"
6464
}

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends:
1010
libxml2-dev,
1111
doxygen,
1212
swig,
13-
java8-sdk-headless,
13+
java11-sdk-headless,
1414
libpython3-dev,
1515
python3-setuptools
1616
Standards-Version: 4.5.1

‎test/CMakeLists.txt‎

Lines changed: 82 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,83 @@
1-
find_package( Boost COMPONENTS unit_test_framework )
2-
if( Boost_INCLUDE_DIR )
3-
set_env(RUN_TESTS "" CACHE STRING "Run tests on build")
4-
set_env(TEST_FORMAT XML CACHE STRING "Test result format (XML/JUNIT)")
5-
set( CMAKE_SKIP_RPATH OFF )
6-
include_directories(${Boost_INCLUDE_DIR})
7-
add_definitions(
8-
-DDIGIDOCPPCONF="${CMAKE_SOURCE_DIR}/etc/schema"
9-
-DPKCS11_MODULE="${PKCS11_MODULE}"
10-
-DSIVA_URL="${SIVA_URL}"
11-
)
12-
add_executable(unittests libdigidocpp_boost.cpp)
13-
add_executable(TSLTests TSLTests.cpp)
14-
target_link_libraries(unittests digidocpp digidocpp_priv)
15-
target_link_libraries(TSLTests digidocpp digidocpp_util)
16-
if(WIN32)
17-
string(REPLACE "/EHsc" "/EHa" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
18-
set_target_properties(unittests TSLTests PROPERTIES COMPILE_FLAGS "/bigobj")
19-
else()
20-
set_target_properties(unittests TSLTests PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-unused-variable")
21-
endif()
22-
add_test(NAME runtest
23-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/unittests --build_info=YES --report_level=no --logger=${TEST_FORMAT},all,${CMAKE_CURRENT_BINARY_DIR}/libdigidocpp.xml -- ${CMAKE_CURRENT_SOURCE_DIR}/data
24-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
25-
)
26-
add_test(NAME TSLTest_CA-invalid-type
27-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-invalid-type.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
28-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
29-
)
30-
add_test(NAME TSLTest_CA-non-qa
31-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-non-qa.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
32-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
33-
)
34-
add_test(NAME TSLTest_CA-withdrawn
35-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-withdrawn.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
36-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37-
)
38-
add_test(NAME TSLTest_CA-withdrawn-granted-before
39-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-withdrawn-granted-before.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
40-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
41-
)
42-
add_test(NAME TSLTest_CA-withdrawn-granted-after
43-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-withdrawn-granted-after.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
44-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
45-
)
46-
add_test(NAME TSLTest_OCSP-invalid-type
47-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-invalid-type.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
48-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
49-
)
50-
add_test(NAME TSLTest_OCSP-withdrawn
51-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-withdrawn.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
52-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
53-
)
54-
add_test(NAME TSLTest_OCSP-withdrawn-granted-before
55-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-withdrawn-granted-before.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
56-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
57-
)
58-
add_test(NAME TSLTest_OCSP-withdrawn-granted-after
59-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-withdrawn-granted-after.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
60-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
61-
)
62-
add_test(NAME TSLTest_TSA-invalid-type
63-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-invalid-type.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
64-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
65-
)
66-
add_test(NAME TSLTest_TSA-withdrawn
67-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-withdrawn.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
68-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
69-
)
70-
add_test(NAME TSLTest_TSA-withdrawn-granted-before
71-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-withdrawn-granted-before.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
72-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
73-
)
74-
add_test(NAME TSLTest_TSA-withdrawn-granted-after
75-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-withdrawn-granted-after.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
76-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
77-
)
78-
add_test(NAME TSLTest_EE_T-no_QCStatement
79-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-no_QCStatement.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
80-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
81-
)
82-
add_test(NAME TSLTest_EE_T-no_QCSD
83-
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-no_QCSD.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
84-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
85-
)
86-
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS unittests TSLTests)
1+
set_env(RUN_TESTS "" CACHE STRING "Run tests on build")
2+
set_env(TEST_FORMAT XML CACHE STRING "Test result format (XML/JUNIT)")
3+
set( CMAKE_SKIP_RPATH OFF )
4+
add_definitions(
5+
-DDIGIDOCPPCONF="${CMAKE_SOURCE_DIR}/etc/schema"
6+
-DPKCS11_MODULE="${PKCS11_MODULE}"
7+
-DSIVA_URL="${SIVA_URL}"
8+
)
9+
add_executable(unittests libdigidocpp_boost.cpp)
10+
add_executable(TSLTests TSLTests.cpp)
11+
target_link_libraries(unittests digidocpp digidocpp_priv Boost::unit_test_framework)
12+
target_link_libraries(TSLTests digidocpp digidocpp_util Boost::unit_test_framework)
13+
if(WIN32)
14+
string(REPLACE "/EHsc" "/EHa" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
15+
set_target_properties(unittests TSLTests PROPERTIES COMPILE_FLAGS "/bigobj")
16+
else()
17+
set_target_properties(unittests TSLTests PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-unused-variable")
8718
endif()
19+
add_test(NAME runtest
20+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/unittests --build_info=YES --report_level=no --logger=${TEST_FORMAT},all,${CMAKE_CURRENT_BINARY_DIR}/libdigidocpp.xml -- ${CMAKE_CURRENT_SOURCE_DIR}/data
21+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
22+
)
23+
add_test(NAME TSLTest_CA-invalid-type
24+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-invalid-type.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
25+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
26+
)
27+
add_test(NAME TSLTest_CA-non-qa
28+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-non-qa.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
29+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
30+
)
31+
add_test(NAME TSLTest_CA-withdrawn
32+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-withdrawn.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
33+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
34+
)
35+
add_test(NAME TSLTest_CA-withdrawn-granted-before
36+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-withdrawn-granted-before.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
37+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
38+
)
39+
add_test(NAME TSLTest_CA-withdrawn-granted-after
40+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-CA-withdrawn-granted-after.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
41+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
42+
)
43+
add_test(NAME TSLTest_OCSP-invalid-type
44+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-invalid-type.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
45+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
46+
)
47+
add_test(NAME TSLTest_OCSP-withdrawn
48+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-withdrawn.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
49+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
50+
)
51+
add_test(NAME TSLTest_OCSP-withdrawn-granted-before
52+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-withdrawn-granted-before.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
53+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
54+
)
55+
add_test(NAME TSLTest_OCSP-withdrawn-granted-after
56+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-OCSP-withdrawn-granted-after.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
57+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
58+
)
59+
add_test(NAME TSLTest_TSA-invalid-type
60+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-invalid-type.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
61+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
62+
)
63+
add_test(NAME TSLTest_TSA-withdrawn
64+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-withdrawn.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
65+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
66+
)
67+
add_test(NAME TSLTest_TSA-withdrawn-granted-before
68+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-withdrawn-granted-before.xml good ${CMAKE_CURRENT_SOURCE_DIR}/data
69+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
70+
)
71+
add_test(NAME TSLTest_TSA-withdrawn-granted-after
72+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-TSA-withdrawn-granted-after.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
73+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
74+
)
75+
add_test(NAME TSLTest_EE_T-no_QCStatement
76+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-no_QCStatement.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
77+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
78+
)
79+
add_test(NAME TSLTest_EE_T-no_QCSD
80+
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TSLTests -- EE_T-no_QCSD.xml bad ${CMAKE_CURRENT_SOURCE_DIR}/data
81+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
82+
)
83+
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS unittests TSLTests)

0 commit comments

Comments
 (0)