Merge pull request #2786 from vvbandeira/dep-no-arg

DependencyInstaller.sh defaults to no option

Author: maliberty

docker/Dockerfile.dev

@@ -15,10 +15,12 @@ COPY InstallerOpenROAD.sh \
 ARG options=""
 ARG constantBuildDir="-constant-build-dir"
 
-RUN env CFLAGS="-D__TIME__=0 -D__DATE__=0 -D__TIMESTAMP__=0 -Wno-builtin-macro-redefined" \
-      CXXFLAGS="-D__TIME__=0 -D__DATE__=0 -D__TIMESTAMP__=0 -Wno-builtin-macro-redefined" \
-      ./DependencyInstaller.sh $options $constantBuildDir \
-      && rm -rf /tmp/installer /tmp/* /var/tmp/* /var/lib/apt/lists/*
+ENV CFLAGS="-D__TIME__=0 -D__DATE__=0 -D__TIMESTAMP__=0 -Wno-builtin-macro-redefined"
+ENV CXXFLAGS="-D__TIME__=0 -D__DATE__=0 -D__TIMESTAMP__=0 -Wno-builtin-macro-redefined"
+
+RUN ./DependencyInstaller.sh -base $options $constantBuildDir \
+    && ./DependencyInstaller.sh -common $options $constantBuildDir \
+    && rm -rf /tmp/installer /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
 ARG fromImage
 

etc/DependencyInstaller.sh

@@ -260,7 +260,7 @@ OR_INSTALLER_ARGS="-eqy"
 # default prefix
 PREFIX=""
 # default option
-option="all"
+option="none"
 # default isLocal
 isLocal="false"
 constantBuildDir="false"
@@ -272,19 +272,25 @@ while [ "$#" -gt 0 ]; do
         -h|-help)
             _help 0
             ;;
+        -all)
+            if [[ "${option}" != "none" ]]; then
+                echo "WARNING: previous argument -${option} will be overwritten with -all." >&2
+            fi
+            option="all"
+            ;;
         -base)
-            OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -base"
-            if [[ "${option}" != "all" ]]; then
+            if [[ "${option}" != "none" ]]; then
                 echo "WARNING: previous argument -${option} will be overwritten with -base." >&2
             fi
             option="base"
+            OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -${option}"
             ;;
         -common)
-            OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -common"
-            if [[ "${option}" != "all" ]]; then
+            if [[ "${option}" != "none" ]]; then
                 echo "WARNING: previous argument -${option} will be overwritten with -common." >&2
             fi
             option="common"
+            OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -${option}"
             ;;
         -local)
             OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -local"
@@ -309,6 +315,13 @@ while [ "$#" -gt 0 ]; do
     shift 1
 done
 
+if [[ "${option}" == "none"  ]]; then
+        echo "You must use one of: -all|-base|-common" >&2
+        _help
+fi
+
+OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -${option}"
+
 platform="$(uname -s)"
 case "${platform}" in
     "Linux" )

tools/AutoTuner/kubernetes/Dockerfile

@@ -9,5 +9,6 @@ RUN sudo apt-get update -y \
     && rm ./klayout_0.27.1-1_amd64.deb
 
 RUN wget https://raw.githubusercontent.com/The-OpenROAD-Project/OpenROAD/master/etc/DependencyInstaller.sh \
-    && sudo bash ./DependencyInstaller.sh -dev \
+    && sudo bash ./DependencyInstaller.sh -base \
+    && sudo bash ./DependencyInstaller.sh -common \
     && rm DependencyInstaller.sh