Skip to content

Commit 7d3be80

Browse files
authored
Merge pull request #2705 from Pinata-Consulting/support-ubuntu-22.10
Add Ubuntu 22.10 support
2 parents 8781b94 + d8df8ef commit 7d3be80

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

etc/DependencyInstaller.sh

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ _installOrTools() {
126126
os=$1
127127
version=$2
128128
arch=$3
129-
orToolsVersionBig=9.4
130-
orToolsVersionSmall=${orToolsVersionBig}.1874
129+
orToolsVersionBig=9.5
130+
orToolsVersionSmall=${orToolsVersionBig}.2237
131+
131132
orToolsFile=or-tools_${arch}_${os}-${version}_cpp_v${orToolsVersionSmall}.tar.gz
132133
wget https://github.com/google/or-tools/releases/download/v${orToolsVersionBig}/${orToolsFile}
133134
orToolsPath="/opt/or-tools"
@@ -172,20 +173,28 @@ _installUbuntuPackages() {
172173
apt-get install -y \
173174
binutils \
174175
libgomp1 \
175-
libpython3.8 \
176176
libtcl \
177177
qt5-image-formats-plugins \
178178
tcl-tclreadline \
179179
wget
180180

181-
if [[ $1 == 22.04 ]]; then
181+
if [[ $1 == 22.10 ]]; then
182182
apt-get install -y \
183183
qtbase5-dev \
184184
qtchooser \
185185
qt5-qmake \
186-
qtbase5-dev-tools
186+
qtbase5-dev-tools \
187+
libpython3.11
188+
elif [[ $1 == 22.04 ]]; then
189+
apt-get install -y \
190+
qtbase5-dev \
191+
qtchooser \
192+
qt5-qmake \
193+
qtbase5-dev-tools \
194+
libpython3.8
187195
else
188-
apt-get install -y qt5-default
196+
apt-get install -y qt5-default \
197+
libpython3.8
189198
fi
190199

191200
# need the strip "hack" above to run on docker
@@ -535,7 +544,7 @@ EOF
535544
;;
536545
"Darwin" )
537546
_installDarwin
538-
_installOrTools "MacOsX" "12.5" $(uname -m)
547+
_installOrTools "MacOsX" "13.0.1" $(uname -m)
539548
cat <<EOF
540549
541550
To install or run openroad, update your path with:

0 commit comments

Comments
 (0)