Skip to content

Commit 3fa8a53

Browse files
committed
Merge branch 'master' into secure-check_antennas_metrics
Signed-off-by: Eder Monteiro <[email protected]>
2 parents 5705412 + eb58be1 commit 3fa8a53

File tree

14 files changed

+312
-477
lines changed

14 files changed

+312
-477
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,5 @@ docs/build
9090
GitGuide.md
9191
mainREADME.md
9292
build
93+
.scala-build/
94+
.bsp/

build_openroad.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OPENROAD_APP_BRANCH="master"
2020
INSTALL_PATH="$(pwd)/tools/install"
2121

2222
YOSYS_USER_ARGS=""
23-
YOSYS_ARGS="CONFIG=clang ENABLE_NDEBUG=1"
23+
YOSYS_ARGS="CONFIG=clang"
2424

2525
OPENROAD_APP_USER_ARGS=""
2626
OPENROAD_APP_ARGS=""

etc/DependencyInstaller.sh

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ _installCentosCleanUp() {
4242
}
4343

4444
_installCentosPackages() {
45-
yum update -y
46-
yum install -y \
45+
yum -y update
46+
yum -y install \
4747
time \
4848
ruby \
4949
ruby-devel
5050

5151
if ! [ -x "$(command -v klayout)" ]; then
52-
yum install -y https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
52+
yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
5353
else
5454
currentVersion=$(klayout -v | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
5555
if _versionCompare $currentVersion -ge $klayoutVersion; then
5656
echo "KLayout version greater than or equal to ${klayoutVersion}"
5757
else
5858
echo "KLayout version less than ${klayoutVersion}"
5959
sudo yum remove -y klayout
60-
yum install -y https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
60+
yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
6161
fi
6262
fi
6363
}
@@ -74,6 +74,7 @@ _installUbuntuPackages() {
7474
libqt5multimediawidgets5 \
7575
libqt5svg5-dev \
7676
libqt5xmlpatterns5-dev \
77+
libqt5opengl5 \
7778
libz-dev \
7879
python3-pip \
7980
qtmultimedia5-dev \
@@ -84,7 +85,7 @@ _installUbuntuPackages() {
8485

8586
# install KLayout
8687
if _versionCompare $1 -ge 23.04; then
87-
apt-get install -y klayout python3-pandas
88+
apt-get -y install --no-install-recommends klayout python3-pandas
8889
else
8990
if [[ $1 == 20.04 ]]; then
9091
klayoutChecksum=15a26f74cf396d8a10b7985ed70ab135
@@ -113,25 +114,24 @@ _installDarwinPackages() {
113114

114115
_installCI() {
115116
apt-get -y update
116-
117-
#docker
118-
apt install -y \
117+
apt-get -y install --no-install-recommends \
119118
apt-transport-https \
120119
ca-certificates \
120+
coreutils \
121121
curl \
122+
python3 \
122123
software-properties-common
124+
123125
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
124-
echo \
125-
"deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
126-
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
127-
apt-get -y update
128-
apt-get install -y docker-ce docker-ce-cli containerd.io
126+
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
127+
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
129128

130-
# python
131-
apt-get install -y python3
129+
apt-get -y update
130+
apt-get -y install --no-install-recommends \
131+
docker-ce \
132+
docker-ce-cli \
133+
containerd.io
132134

133-
# stdbuf
134-
apt-get install -y coreutils
135135
}
136136

137137
_help() {

flow/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,11 @@ endif
608608
.PHONY: do-$(1)
609609
do-$(1): $(OBJECTS_DIR)/copyright.txt
610610
@echo Running $(3).tcl, stage $(1)
611-
@(trap 'mv $(LOG_DIR)/$(1).tmp.log $(LOG_DIR)/$(1).log' EXIT; \
612-
$(OPENROAD_EXE) -exit $(SCRIPTS_DIR)/noop.tcl 2>&1 >$(LOG_DIR)/$(1).tmp.log; \
613-
$(TIME_CMD) $(OPENROAD_CMD) -no_splash $(SCRIPTS_DIR)/$(3).tcl -metrics $(LOG_DIR)/$(1).json 2>&1 | \
614-
tee -a $(LOG_DIR)/$(1).tmp.log)
611+
@(set -eo pipefail; \
612+
trap 'mv $(LOG_DIR)/$(1).tmp.log $(LOG_DIR)/$(1).log' EXIT; \
613+
$(OPENROAD_EXE) -exit -no_init $(SCRIPTS_DIR)/noop.tcl 2>&1 >$(LOG_DIR)/$(1).tmp.log; \
614+
$(TIME_CMD) $(OPENROAD_CMD) -no_splash $(SCRIPTS_DIR)/$(3).tcl -metrics $(LOG_DIR)/$(1).json 2>&1 | \
615+
tee -a $(LOG_DIR)/$(1).tmp.log)
615616
endef
616617

617618
# generate make rules to copy a file, if a dependency change and

0 commit comments

Comments
 (0)