Skip to content

Commit c46bca4

Browse files
committed
Generate SPDX info
IB-8706 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent a607af2 commit c46bca4

File tree

14 files changed

+49
-207
lines changed

14 files changed

+49
-207
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ jobs:
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v6
15+
- name: Install CMake
16+
uses: lukka/get-cmake@latest
1517
- name: Build
1618
run: |
1719
cmake -S . -B build -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=RelWithDebInfo
1820
cmake --build build --target pkgbuild
1921
- name: Archive artifacts
20-
uses: actions/upload-artifact@v6
22+
uses: actions/upload-artifact@v7
2123
with:
2224
name: macOS
23-
path: build/*.pkg
25+
path: |
26+
build/*.pkg
27+
build/ID-updater.spdx.json
2428
windows:
2529
name: Build on Windows
2630
runs-on: ${{ matrix.platform == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
@@ -50,6 +54,8 @@ jobs:
5054
uses: ilammy/msvc-dev-cmd@v1
5155
with:
5256
arch: ${{ matrix.platform }}
57+
- name: Install CMake
58+
uses: lukka/get-cmake@latest
5359
- name: Install WiX
5460
run: |
5561
dotnet tool install -g wix --version 6.0.2
@@ -62,8 +68,11 @@ jobs:
6268
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
6369
-DVCPKG_TARGET_TRIPLET=${{ matrix.platform }}-windows
6470
cmake --build build --target installer
71+
dir build
6572
- name: Archive artifacts
66-
uses: actions/upload-artifact@v6
73+
uses: actions/upload-artifact@v7
6774
with:
6875
name: msi_${{ matrix.vcver }}_${{ matrix.platform }}
69-
path: build/*.msi
76+
path: |
77+
build/*.msi
78+
build/ID-updater.spdx.json

Application.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#include "Application.h"
215

Application.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#pragma once
215

CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.22)
2-
project(ID-updater VERSION 3.19.0)
2+
project(ID-updater VERSION 3.19.0
3+
DESCRIPTION "Open-eID updater application for macOS and Windows"
4+
HOMEPAGE_URL https://github.com/open-eid/updater
5+
SPDX_LICENSE LGPL-2.1-or-later
6+
)
37

48
macro( SET_ENV NAME DEF )
59
if( DEFINED ENV{${NAME}} )
@@ -10,6 +14,7 @@ macro( SET_ENV NAME DEF )
1014
endmacro()
1115

1216
set_env(BUILD_NUMBER 0)
17+
set(CMAKE_EXPERIMENTAL_GENERATE_SBOM ca494ed3-b261-4205-a01f-603c95e4cae0)
1318
set(VERSION ${PROJECT_VERSION}.${BUILD_NUMBER})
1419
set_env( CONFIG_URL "https://id.eesti.ee/config.json" CACHE STRING "Set Config URL" )
1520
set_env( SIGNCERT "" CACHE STRING "Common name of certificate to used sign binaries, empty skip signing" )
@@ -118,7 +123,7 @@ if( APPLE )
118123
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/prefPane/Info.plist.cmake
119124
MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}
120125
MACOSX_BUNDLE_GUI_IDENTIFIER "ee.ria.${PROJECT_NAME}"
121-
MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2025 Estonian Information System Authority"
126+
MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2026 Estonian Information System Authority"
122127
MACOSX_BUNDLE_ICON_FILE Icon.icns
123128
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
124129
MACOSX_BUNDLE_BUNDLE_VERSION ${BUILD_NUMBER}
@@ -129,7 +134,10 @@ if( APPLE )
129134
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
130135
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/id-updater-helper $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Resources
131136
)
132-
install( TARGETS ${PROJECT_NAME} DESTINATION /Library/PreferencePanes )
137+
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Export DESTINATION /Library/PreferencePanes)
138+
export(SBOM ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Export
139+
#PACKAGE_URL "pkg:github/open-eid/updater@${PROJECT_VERSION}"
140+
)
133141

134142
# Sign bundle after resources are copied
135143
add_custom_target(signhelper DEPENDS ${PROJECT_NAME})
@@ -197,7 +205,6 @@ else()
197205
msi wintrust Crypt32 taskschd comsupp Setupapi winscard Wtsapi32
198206
)
199207
qt_add_translations(${PROJECT_NAME} TS_FILES idupdater_et.ts idupdater_ru.ts
200-
common/translations/common_et.ts common/translations/common_ru.ts
201208
common/translations/qtbase_et.ts common/translations/qtbase_ru.ts
202209
RESOURCE_PREFIX /
203210
LUPDATE_OPTIONS -locations none
@@ -231,6 +238,8 @@ else()
231238
${CMAKE_SOURCE_DIR}/common/WixUI_Minimal.wxs
232239
-o ${MSI_FILE}.msi
233240
)
241+
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Export)
242+
export(SBOM ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Export)
234243
if(SIGNCERT)
235244
if(CROSSSIGNCERT)
236245
target_link_options(${PROJECT_NAME} PRIVATE "/INTEGRITYCHECK")

ScheduledUpdateTask.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#include "ScheduledUpdateTask.h"
215

ScheduledUpdateTask.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#pragma once
215

idupdater.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#include "idupdater.h"
215

idupdater.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#pragma once
215

idupdater.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BEGIN
2121
VALUE "FileDescription", "ID Updater Application"
2222
VALUE "FileVersion", VERSION
2323
VALUE "InternalName", "id-updater"
24-
VALUE "LegalCopyright", "Copyright (C) 2009-2025 Estonian Information System Authority"
24+
VALUE "LegalCopyright", "Copyright (C) 2009-2026 Estonian Information System Authority"
2525
VALUE "OriginalFilename", "id-updater.exe"
2626
VALUE "ProductName", "id-updater"
2727
VALUE "ProductVersion", VERSION

prefPane/AdvancedWindowController.swift

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* id-updater
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
import Cocoa
215
import SwiftUI

0 commit comments

Comments
 (0)