Skip to content

Commit d34e3ac

Browse files
authored
Merge pull request #8308 from wjrforcyber/modify_binary_path
Refactor(Binary): Specify binary path
2 parents 9f77148 + c60c7bf commit d34e3ac

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

docker/Dockerfile.binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ FROM $copyImage AS copyfrom
1212

1313
FROM $fromImage
1414

15-
COPY --from=copyfrom /OpenROAD/build/src/openroad /usr/bin/.
15+
COPY --from=copyfrom /OpenROAD/build/bin/openroad /usr/bin/.
1616

1717
ENTRYPOINT [ "openroad" ]

docs/user/Build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Please refer to the instructions for installing prebuilt binaries
5050
## Build Locally
5151

5252
The default build type is `RELEASE` to compile optimized code.
53-
The resulting executable is in `build/src/openroad`.
53+
The resulting executable is in `build/bin/openroad`.
5454

5555
Optional CMake variables passed as `-D<var>=<value>` arguments to CMake are show below.
5656

etc/DockerHelper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ _test() {
144144
_create
145145
fi
146146
if [[ "${testTarget}" == "smoke" ]]; then
147-
docker run --rm "${imagePath}" bash -c './build/src/openroad -help'
147+
docker run --rm "${imagePath}" bash -c './build/bin/openroad -help'
148148
else
149149
docker run --rm "${imagePath}" "./docker/test_wrapper.sh" "${compiler}" "ctest --test-dir build -j ${numThreads}"
150150
fi

jenkins/Jenkinsfile.nightly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ node {
4747
stage("Run ${name}") {
4848
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
4949
timeout(time: 8, unit: 'HOURS') {
50-
sh "python3 src/drt/test/run-ispd.py --program ${WORKSPACE}/build/src/openroad --tests ispd${ispd_year}_test${test_to_run}";
50+
sh "python3 src/drt/test/run-ispd.py --program ${WORKSPACE}/build/bin/openroad --tests ispd${ispd_year}_test${test_to_run}";
5151
}
5252
}
5353
}

src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ add_executable(openroad
289289
${OPENROAD_SOURCE}
290290
)
291291

292+
set_target_properties(openroad PROPERTIES
293+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
294+
)
295+
292296
target_compile_options(openroad
293297
PRIVATE
294298
-Wextra -pedantic -Wcast-qual

src/rcx/calibration/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkdir -p work
55
cd work
66

77
# Create a soft link to openroad executable
8-
ln -s ../../../../build/src/openroad
8+
ln -s ../../../../build/bin/openroad
99

1010
# Step A: Generate Patterns Layout that models
1111
# various capacitance and resistance

test/regression_vars.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set app "openroad"
2121
if { [info exist ::env(OPENROAD_EXE)] } {
2222
set app_path "$::env(OPENROAD_EXE)"
2323
} else {
24-
set app_path [file join $openroad_dir "build" "src" $app]
24+
set app_path [file join $openroad_dir "build" "bin" $app]
2525
}
2626
# Application options.
2727
set app_options "-no_init -no_splash -exit"

0 commit comments

Comments
 (0)