v30.3-roots.1 · Commit 7: [PATCH 07/68] build: adapt Roots maintenance and assurance to Core 30.3
cmake/module/Maintenance.cmake
Before: cmake/module/Maintenance.cmake · After: cmake/module/Maintenance.cmake
File metadata
index fea786e4153b745936ec97b6da312cab881bb64c..5f4b1d8aa8ef88cf27b5d83448a8dfeeff5b7ba3 100644
Download original patch · Release notes
Diff rows 1–35 of 35. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. The two line-number columns refer to before and after.
cmake/module/Maintenance.cmake
CHANGED
|
@@ -68,7 +68,6 @@ function(add_windows_deploy_target)
|
|
|
68
68
|
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-util> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-util>
|
|
69
69
|
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:test_bitcoin> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:test_bitcoin>
|
|
70
70
|
COMMAND ${MAKENSIS_EXECUTABLE} -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
|
|
71
|
-
DEPENDS generate_nsis_images
|
|
72
71
|
VERBATIM
|
|
73
72
|
)
|
|
74
73
|
add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe)
|
|
@@ -83,20 +82,11 @@ function(add_macos_deploy_target)
|
|
|
83
82
|
file(CONFIGURE OUTPUT ${macos_app}/Contents/PkgInfo CONTENT "APPL????")
|
|
84
83
|
# Populate Contents/Resources subdirectory.
|
|
85
84
|
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/empty.lproj CONTENT "")
|
|
85
|
+
configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns NO_SOURCE_PERMISSIONS COPYONLY)
|
|
86
86
|
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/Base.lproj/InfoPlist.strings
|
|
87
87
|
CONTENT "{ CFBundleDisplayName = \"@CLIENT_NAME@\"; CFBundleName = \"@CLIENT_NAME@\"; }"
|
|
88
88
|
)
|
|
89
89
|
|
|
90
|
-
set(bitcoin_icns ${PROJECT_BINARY_DIR}/src/qt/res/rendered_icons/bitcoin.icns)
|
|
91
|
-
set(bitcoin_icns_dest ${macos_app}/Contents/Resources/bitcoin.icns)
|
|
92
|
-
add_custom_command(
|
|
93
|
-
OUTPUT ${bitcoin_icns_dest}
|
|
94
|
-
COMMAND ${CMAKE_COMMAND} -E copy ${bitcoin_icns} ${bitcoin_icns_dest}
|
|
95
|
-
DEPENDS generate_icns
|
|
96
|
-
VERBATIM
|
|
97
|
-
)
|
|
98
|
-
add_custom_target(bitcoin_icns_deployed DEPENDS "${bitcoin_icns_dest}")
|
|
99
|
-
|
|
100
90
|
add_custom_command(
|
|
101
91
|
OUTPUT ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt
|
|
102
92
|
COMMAND ${CMAKE_COMMAND} --install ${PROJECT_BINARY_DIR} --config $<CONFIG> --component bitcoin-qt --prefix ${macos_app}/Contents/MacOS --strip
|
|
@@ -149,7 +139,6 @@ function(add_macos_deploy_target)
|
|
|
149
139
|
endif()
|
|
150
140
|
endif()
|
|
151
141
|
add_dependencies(deploydir bitcoin-qt)
|
|
152
|
-
add_dependencies(deploydir bitcoin_icns_deployed)
|
|
153
142
|
add_dependencies(deploy deploydir)
|
|
154
143
|
endif()
|
|
155
144
|
endfunction()
|