Skip to content

Commit ba4579f

Browse files
committed
general cleanup
1 parent 477c7fd commit ba4579f

File tree

3 files changed

+4
-44
lines changed

3 files changed

+4
-44
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,35 +69,23 @@ jobs:
6969
run: .\test.exe
7070
working-directory: build/test/Release
7171

72-
- name: 📦 pack
73-
run: cpack -C ${{ env.BUILD_TYPE }}
74-
working-directory: build
75-
76-
# - name: debug
77-
# run: ls -R
78-
# working-directory: build
79-
8072
- name: Create artifacts directory
8173
run: mkdir atf
8274

8375
# put the following inside "atf" subdir:
84-
# 1. msi installer, renamed after version number
76+
# 1. msi installer, renamed after version number (removed in 5.5.1)
8577
# 2. zipped .exe
8678
# 3. version.txt containing version number
8779
- name: prep artifacts
8880
run: |
89-
cp build/bt.msi atf/${{ env.MSI_FILE_NAME }}
9081
Compress-Archive -Path build/bt/Release/bt.exe -DestinationPath atf/${{ env.ZIP_FILE_NAME }} -CompressionLevel Optimal
9182
Compress-Archive -Path build/bt/Release/bt.pdb -DestinationPath atf/${{ env.PDB_FILE_NAME }} -CompressionLevel Optimal
9283
"${{ env.VERSION }}" | Out-File atf/version.txt -NoNewline
93-
(Get-FileHash -Algorithm SHA256 -Path atf/${{ env.ZIP_FILE_NAME }}).Hash | Out-File atf/${{ env.ZIP_FILE_NAME }}.sha256.txt
94-
(Get-FileHash -Algorithm SHA256 -Path atf/${{ env.MSI_FILE_NAME }}).Hash | Out-File atf/${{ env.MSI_FILE_NAME }}.sha256.txt
9584
cp docs/release-notes.md atf/
9685
cp docs/instructions.md atf/
9786
env:
9887
ZIP_FILE_NAME: bt-${{ env.VERSION }}.zip
9988
PDB_FILE_NAME: pdb-${{ env.VERSION }}.zip
100-
MSI_FILE_NAME: bt-${{ env.VERSION }}.msi
10189

10290
- uses: actions/upload-artifact@v4
10391
name: collect binaries

bt/CMakeLists.txt

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -87,34 +87,4 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND CMAKE_BUILD_TYPE MATCHES "Release")
8787
COMPILE_PDB_NAME ${APP_NAME}
8888
COMPILE_PDB_OUTPUT_DIR ${CMAKE_BINARY_DIR}
8989
)
90-
endif()
91-
92-
# packaging
93-
# see https://github.com/WerWolv/ImHex/blob/5680b90549dc940772daf3d31c72afd62f28b38f/cmake/build_helpers.cmake#L133
94-
# wix variables: https://cmake.org/cmake/help/latest/cpack_gen/wix.html
95-
set(CMAKE_INSTALL_BINDIR ".")
96-
install(TARGETS bt RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
97-
set(CPACK_GENERATOR WIX)
98-
set(CPACK_PACKAGE_NAME "Browser Tamer")
99-
set(CPACK_PACKAGE_FILE_NAME "bt")
100-
101-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Browser Tamer")
102-
103-
set(CPACK_WIX_PROGRAM_MENU_FOLDER "Browser Tamer")
104-
set_property(
105-
INSTALL "$<TARGET_FILE_NAME:bt>"
106-
PROPERTY CPACK_START_MENU_SHORTCUTS "Browser Tamer"
107-
)
108-
109-
set(CPACK_PACKAGE_VENDOR "aloneguid")
110-
set(CPACK_WIX_UPGRADE_GUID "8DC2A015-9B09-489F-92D6-12EA47E22FBB")
111-
set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/bt/icon.ico")
112-
set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/resources/dist/wix_banner.png")
113-
set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/wix_dialog.png")
114-
set(CPACK_WIX_ARCHITECTURE "x64")
115-
set(CPACK_PACKAGE_DESCRIPTION "todo: description")
116-
set(CPACK_PACKAGE_HOMEPAGE_URL ${APP_URL})
117-
set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT ${APP_URL})
118-
set(CPACK_WIX_PROPERTY_ARPHELPLINK ${APP_URL})
119-
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/resources/dist/LICENSE.rtf")
120-
include(CPack)
90+
endif()

docs/release-notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## 5.5.1
22

33
- bug: Firefox profiles were lost during configuration load, because they were assigned unrecognisable IDs on discovery. Thanks to @pibcht in #170 for early report.
4+
- cleanup: removed `.msi` compilation target, now only `.exe` installer is provided; originally `.msi` was only created to satisfy some package manager requirements, however this is not longer needed.
5+
- cleanup: sha-256 checksums are not published alongside releases anymore, because GitHub now provides automatic checksum generation for all release assets.
46
- meta: These release notes were NOT written by AI, despite being spell-checked by an AI that thinks "colour" is always wrong. Any resemblance to coherent documentation is purely coincidental and will be fixed in 5.5.2.
57

68
## 5.5.0

0 commit comments

Comments
 (0)