build updates

Author: def-

ddnet-setup.sh

@@ -19,12 +19,13 @@ NAME_SQL=`echo $NAME_UPPER | head -c3`
 apt-get -y update
 apt-get -y upgrade
 apt-get -y dist-upgrade
-apt-get -y install bsdutils tree zsh vim htop git g++ libboost-dev python3-requests sshfs tcpdump gdb pkg-config ntpdate ntp mailutils msmtp msmtp-mta libssl-dev libmariadb-dev-compat libmariadb-dev libmysqlcppconn-dev cmake make unattended-upgrades apt-listchanges iptables-persistent libwebsockets-dev libcurl4-openssl-dev python3 dnsmasq strace dnsutils sqlite3 libsqlite3-dev mariadb-client rsync libreadline-dev binutils-dev libpcap-dev libnl-genl-3-dev dh-autoreconf conntrack ncdu psmisc ethtool net-tools mtr-tiny adduser cron iptables wget screen libmaxminddb-dev unzip ipset curl zstd python3-pip fd-find fish glances ripgrep python3-cachetools python3-dnslib
+apt-get -y install bsdutils tree zsh vim htop git g++ libboost-dev python3-requests sshfs tcpdump gdb pkg-config mailutils msmtp msmtp-mta libssl-dev libmariadb-dev-compat libmariadb-dev libmysqlcppconn-dev cmake make unattended-upgrades apt-listchanges iptables-persistent libwebsockets-dev libcurl4-openssl-dev python3 dnsmasq strace dnsutils sqlite3 libsqlite3-dev mariadb-client rsync libreadline-dev binutils-dev libpcap-dev libnl-genl-3-dev dh-autoreconf conntrack ncdu psmisc ethtool net-tools mtr-tiny adduser cron iptables wget screen libmaxminddb-dev unzip ipset curl zstd python3-pip fd-find fish glances ripgrep python3-cachetools python3-dnslib
 rm -rf  /root/.acme.sh
 rm -rf ~/.pip # bad tencent server on some CHN locations
 if [[ "$NAME_SQL" == "CHN" ]]; then
   pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
 fi
+apt-get remove python3-dateutil
 pip3 install sqlite3-to-mysql --upgrade --break-system-packages || pip3 install sqlite3-to-mysql --upgrade --break-system-packages
 
 hostnamectl set-hostname ddnet$NAME_LOWER

release/build.sh

@@ -94,7 +94,7 @@ build_remote_macos ()
   cmake -DVERSION=$VERSION -DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\" -DCMAKE_BUILD_TYPE=Release -DDISCORD=ON -DWEBSOCKETS=OFF -DIPO=OFF -DPREFER_BUNDLED_LIBS=ON $(echo $FLAGS) ../ddnet-source && \
   unset CXXFLAGS && \
   unset LDFLAGS && \
-  make -j10 package_default
+  nice -n19 make -j8 package_default
   "
 }
 
@@ -127,7 +127,7 @@ build_remote_windows_arm64 ()
   export LIBS_REPO_BRANCH=\"$LIBS_REPO_BRANCH\" && \
   export CXXFLAGS=\"$OUR_CXXFLAGS\" && \
   export FLAGS=\"$FLAGS\" && \
-  ./script.sh $VERSION
+  nice -n19 ./script.sh $VERSION
   "
 }
 
@@ -169,20 +169,24 @@ build_linux ()
     export CXXFLAGS=\"'$CXXFLAGS_WEB' -no-pie\" && \
     export LDFLAGS=\"-no-pie\" && \
     . /root/.cargo/env && \
-    cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DDISCORD=$DISCORD -DDISCORD_DYNAMIC=$DISCORD -DWEBSOCKETS=OFF -DIPO=OFF $(echo $UPDATE_FLAGS) -DPREFER_BUNDLED_LIBS=ON && \
+    mkdir build && \
+    cd build && \
+    cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DDISCORD=$DISCORD -DDISCORD_DYNAMIC=$DISCORD -DWEBSOCKETS=OFF -DIPO=OFF $(echo $UPDATE_FLAGS) -DPREFER_BUNDLED_LIBS=ON .. && \
     unset CXXFLAGS && \
     unset LDFLAGS && \
     make -j1 package_default"
   chroot . sh -c "cd ddnet-source-steam && \
     export CXXFLAGS=\"'$CXXFLAGS_STEAM' -no-pie\" && \
     export LDFLAGS=\"-no-pie\" && \
     . /root/.cargo/env && \
-    cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DDISCORD=$DISCORD -DDISCORD_DYNAMIC=$DISCORD -DWEBSOCKETS=OFF -DIPO=OFF -DSTEAM=ON -DPREFER_BUNDLED_LIBS=ON && \
+    mkdir build && \
+    cd build && \
+    cmake -DVERSION=$VERSION -DCMAKE_BUILD_TYPE=Release -DDISCORD=$DISCORD -DDISCORD_DYNAMIC=$DISCORD -DWEBSOCKETS=OFF -DIPO=OFF -DSTEAM=ON -DPREFER_BUNDLED_LIBS=ON .. && \
     unset CXXFLAGS && \
     unset LDFLAGS && \
     make -j1 package_default"
-  mv ddnet-source/DDNet-*.tar.xz $BUILDS/DDNet-$VERSION-linux_$PLATFORM.tar.xz
-  mv ddnet-source-steam/DDNet-*.tar.xz ../DDNet-$VERSION-steam-linux_$PLATFORM.tar.xz
+  mv ddnet-source/build/DDNet-*.tar.xz $BUILDS/DDNet-$VERSION-linux_$PLATFORM.tar.xz
+  mv ddnet-source-steam/build/DDNet-*.tar.xz ../DDNet-$VERSION-steam-linux_$PLATFORM.tar.xz
 
   rm -rf ddnet-source ddnet-source-steam
   umount $DIR/proc $DIR/sys # $DIR/dev
@@ -278,8 +282,8 @@ if [ "$MAC_AVAILABLE" = true ]; then
 fi
 #(build_macos_website; build_macos_steam) &> builds/mac.log &
 
-build_linux x86_64 $BUILDDIR/debian10 &> builds/linux_x86_64.log &
-CFLAGS=-m32 LDFLAGS=-m32 build_linux x86 $BUILDDIR/debian10_x86 &> builds/linux_x86.log &
+build_linux x86_64 $BUILDDIR/debian11 &> builds/linux_x86_64.log &
+CFLAGS=-m32 LDFLAGS=-m32 build_linux x86 $BUILDDIR/debian11_x86 &> builds/linux_x86.log &
 
 # IPO causes issues with DrMinGW stack traces, so disable for now
 # https://github.com/ddnet/ddnet/issues/5371