v29.4-roots.3 · Commit 7: [PATCH 07/30] release: establish Roots maintenance and assurance
cmake/module/Maintenance.cmake
Before: cmake/module/Maintenance.cmake · After: cmake/module/Maintenance.cmake
File metadata
index 2ece152bf081e3355da0c43eb69b92d32c4fdaea..59e26d1bc110d0e820e71e55c62a57ea15bd10d5 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
|
@@ -59,7 +59,6 @@ function(add_windows_deploy_target)
|
|
|
59
59
|
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-util> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-util>
|
|
60
60
|
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:test_bitcoin> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:test_bitcoin>
|
|
61
61
|
COMMAND makensis -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
|
|
62
|
-
DEPENDS generate_nsis_images
|
|
63
62
|
VERBATIM
|
|
64
63
|
)
|
|
65
64
|
add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe)
|
|
@@ -74,20 +73,11 @@ function(add_macos_deploy_target)
|
|
|
74
73
|
file(CONFIGURE OUTPUT ${macos_app}/Contents/PkgInfo CONTENT "APPL????")
|
|
75
74
|
# Populate Contents/Resources subdirectory.
|
|
76
75
|
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/empty.lproj CONTENT "")
|
|
76
|
+
configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns NO_SOURCE_PERMISSIONS COPYONLY)
|
|
77
77
|
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/Base.lproj/InfoPlist.strings
|
|
78
78
|
CONTENT "{ CFBundleDisplayName = \"@CLIENT_NAME@\"; CFBundleName = \"@CLIENT_NAME@\"; }"
|
|
79
79
|
)
|
|
80
80
|
|
|
81
|
-
set(bitcoin_icns ${PROJECT_BINARY_DIR}/src/qt/res/rendered_icons/bitcoin.icns)
|
|
82
|
-
set(bitcoin_icns_dest ${macos_app}/Contents/Resources/bitcoin.icns)
|
|
83
|
-
add_custom_command(
|
|
84
|
-
OUTPUT ${bitcoin_icns_dest}
|
|
85
|
-
COMMAND ${CMAKE_COMMAND} -E copy ${bitcoin_icns} ${bitcoin_icns_dest}
|
|
86
|
-
DEPENDS generate_icns
|
|
87
|
-
VERBATIM
|
|
88
|
-
)
|
|
89
|
-
add_custom_target(bitcoin_icns_deployed DEPENDS "${bitcoin_icns_dest}")
|
|
90
|
-
|
|
91
81
|
add_custom_command(
|
|
92
82
|
OUTPUT ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt
|
|
93
83
|
COMMAND ${CMAKE_COMMAND} --install ${PROJECT_BINARY_DIR} --config $<CONFIG> --component bitcoin-qt --prefix ${macos_app}/Contents/MacOS --strip
|
|
@@ -134,7 +124,6 @@ function(add_macos_deploy_target)
|
|
|
134
124
|
)
|
|
135
125
|
endif()
|
|
136
126
|
add_dependencies(deploydir bitcoin-qt)
|
|
137
|
-
add_dependencies(deploydir bitcoin_icns_deployed)
|
|
138
127
|
add_dependencies(deploy deploydir)
|
|
139
128
|
endif()
|
|
140
129
|
endfunction()
|