Skip to content

Commit 7a608a2

Browse files
committed
etc: DependencyInstaller.sh defaults to no option
Signed-off-by: Vitor Bandeira <[email protected]>
1 parent ae2e846 commit 7a608a2

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

etc/DependencyInstaller.sh

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ OR_INSTALLER_ARGS="-eqy"
260260
# default prefix
261261
PREFIX=""
262262
# default option
263-
option="all"
263+
option="none"
264264
# default isLocal
265265
isLocal="false"
266266
constantBuildDir="false"
@@ -272,19 +272,27 @@ while [ "$#" -gt 0 ]; do
272272
-h|-help)
273273
_help 0
274274
;;
275+
-all)
276+
if [[ "${option}" != "none" ]]; then
277+
echo "WARNING: previous argument -${option} will be overwritten with -all." >&2
278+
fi
279+
option="all"
280+
;;
275281
-base)
276-
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -base"
277-
if [[ "${option}" != "all" ]]; then
282+
if [[ "${option}" != "none" ]]; then
278283
echo "WARNING: previous argument -${option} will be overwritten with -base." >&2
279284
fi
280285
option="base"
286+
# TODO: change after OR submodule update
287+
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -${option}"
281288
;;
282289
-common)
283-
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -common"
284-
if [[ "${option}" != "all" ]]; then
290+
if [[ "${option}" != "none" ]]; then
285291
echo "WARNING: previous argument -${option} will be overwritten with -common." >&2
286292
fi
287293
option="common"
294+
# TODO: change after OR submodule update
295+
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -${option}"
288296
;;
289297
-local)
290298
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -local"
@@ -309,6 +317,14 @@ while [ "$#" -gt 0 ]; do
309317
shift 1
310318
done
311319

320+
if [[ "${option}" == "none" ]]; then
321+
echo "You must use one of: -all|-base|-common" >&2
322+
_help
323+
fi
324+
325+
# TODO: change after OR submodule update
326+
# OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -${option}"
327+
312328
platform="$(uname -s)"
313329
case "${platform}" in
314330
"Linux" )

tools/AutoTuner/kubernetes/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ RUN sudo apt-get update -y \
99
&& rm ./klayout_0.27.1-1_amd64.deb
1010

1111
RUN wget https://raw.githubusercontent.com/The-OpenROAD-Project/OpenROAD/master/etc/DependencyInstaller.sh \
12-
&& sudo bash ./DependencyInstaller.sh -dev \
12+
&& sudo bash ./DependencyInstaller.sh -base \
13+
&& sudo bash ./DependencyInstaller.sh -common \
1314
&& rm DependencyInstaller.sh

0 commit comments

Comments
 (0)