Skip to content

Commit a78ed72

Browse files
emesareemesare
committed
[Rust] Do not clean out-of-tree dependencies for incremental builds
We already do this for a number of plugins / crates, this commit goes over the rest to make sure that they all do this. We keep cleaning binaryninjacore-sys as we want to generate the core bindings immediately on changes to binaryninjacore.h
1 parent 6546844 commit a78ed72

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎arch/msp430/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ if(APPLE)
5858
OUTPUT ${OUTPUT_FILE_PATH}
5959
COMMAND ${CMAKE_COMMAND} -E env
6060
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
61-
${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS}
61+
${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
6262
COMMAND ${CMAKE_COMMAND} -E env
6363
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
64-
${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS}
64+
${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
6565
COMMAND ${CMAKE_COMMAND} -E env
6666
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
6767
${RUSTUP_COMMAND} build --target=aarch64-apple-darwin ${CARGO_OPTS} ${CARGO_FEATURES}
@@ -83,7 +83,7 @@ if(APPLE)
8383
OUTPUT ${OUTPUT_FILE_PATH}
8484
COMMAND ${CMAKE_COMMAND} -E env
8585
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
86-
${RUSTUP_COMMAND} clean ${CARGO_OPTS}
86+
${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
8787
COMMAND ${CMAKE_COMMAND} -E env
8888
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
8989
${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
@@ -95,7 +95,7 @@ if(APPLE)
9595
elseif(WIN32)
9696
add_custom_command(
9797
OUTPUT ${OUTPUT_FILE_PATH}
98-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
98+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
9999
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
100100
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
101101
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_PDB_NAME} ${OUTPUT_PDB_PATH}
@@ -105,7 +105,7 @@ elseif(WIN32)
105105
else()
106106
add_custom_command(
107107
OUTPUT ${OUTPUT_FILE_PATH}
108-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
108+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
109109
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
110110
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
111111
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

‎arch/riscv/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ if(APPLE)
5858
OUTPUT ${OUTPUT_FILE_PATH}
5959
COMMAND ${CMAKE_COMMAND} -E env
6060
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
61-
${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS}
61+
${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
6262
COMMAND ${CMAKE_COMMAND} -E env
6363
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
64-
${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS}
64+
${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
6565
COMMAND ${CMAKE_COMMAND} -E env
6666
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
6767
${RUSTUP_COMMAND} build --target=aarch64-apple-darwin ${CARGO_OPTS} ${CARGO_FEATURES}
@@ -83,7 +83,7 @@ if(APPLE)
8383
OUTPUT ${OUTPUT_FILE_PATH}
8484
COMMAND ${CMAKE_COMMAND} -E env
8585
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
86-
${RUSTUP_COMMAND} clean ${CARGO_OPTS}
86+
${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
8787
COMMAND ${CMAKE_COMMAND} -E env
8888
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
8989
${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
@@ -95,7 +95,7 @@ if(APPLE)
9595
elseif(WIN32)
9696
add_custom_command(
9797
OUTPUT ${OUTPUT_FILE_PATH}
98-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
98+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
9999
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
100100
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
101101
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_PDB_NAME} ${OUTPUT_PDB_PATH}
@@ -105,7 +105,7 @@ elseif(WIN32)
105105
else()
106106
add_custom_command(
107107
OUTPUT ${OUTPUT_FILE_PATH}
108-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
108+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
109109
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
110110
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
111111
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

‎plugins/dwarf/dwarf_import/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ elseif(WIN32)
139139
if(DEMO)
140140
add_custom_command(
141141
OUTPUT ${OUTPUT_FILE_PATH}
142-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
142+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
143143
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
144144
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
145145
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

‎plugins/pdb-ng/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ if(APPLE)
9191
OUTPUT ${OUTPUT_FILE_PATH}
9292
COMMAND ${CMAKE_COMMAND} -E env
9393
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
94-
${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS}
94+
${RUSTUP_COMMAND} clean --target=aarch64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
9595
COMMAND ${CMAKE_COMMAND} -E env
9696
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
97-
${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS}
97+
${RUSTUP_COMMAND} clean --target=x86_64-apple-darwin ${CARGO_OPTS} --package binaryninjacore-sys
9898
COMMAND ${CMAKE_COMMAND} -E env
9999
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
100100
${RUSTUP_COMMAND} build --target=aarch64-apple-darwin ${CARGO_OPTS} ${CARGO_FEATURES}
@@ -110,7 +110,7 @@ if(APPLE)
110110
OUTPUT ${OUTPUT_FILE_PATH}
111111
COMMAND ${CMAKE_COMMAND} -E env
112112
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
113-
${RUSTUP_COMMAND} clean ${CARGO_OPTS}
113+
${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
114114
COMMAND ${CMAKE_COMMAND} -E env
115115
MACOSX_DEPLOYMENT_TARGET=10.14 BINARYNINJADIR=${BINJA_LIB_DIR}
116116
${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
@@ -123,7 +123,7 @@ elseif(WIN32)
123123
if(DEMO)
124124
add_custom_command(
125125
OUTPUT ${OUTPUT_FILE_PATH}
126-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
126+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
127127
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
128128
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
129129
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -132,7 +132,7 @@ elseif(WIN32)
132132
else()
133133
add_custom_command(
134134
OUTPUT ${OUTPUT_FILE_PATH}
135-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
135+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
136136
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
137137
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
138138
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_PDB_NAME} ${OUTPUT_PDB_PATH}
@@ -143,7 +143,7 @@ elseif(WIN32)
143143
else()
144144
add_custom_command(
145145
OUTPUT ${OUTPUT_FILE_PATH}
146-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
146+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
147147
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
148148
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
149149
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

‎plugins/svd/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ elseif(WIN32)
139139
if(DEMO)
140140
add_custom_command(
141141
OUTPUT ${OUTPUT_FILE_PATH}
142-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
142+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
143143
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
144144
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
145145
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

‎plugins/workflow_objc/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ elseif(WIN32)
142142
if(DEMO)
143143
add_custom_command(
144144
OUTPUT ${OUTPUT_FILE_PATH}
145-
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS}
145+
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
146146
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
147147
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
148148
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

0 commit comments

Comments
 (0)