From 1810143835d5343c660ee058afea25759123151a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= <ole.andre.rodlie@gmail.com>
Date: Sat, 9 Mar 2024 23:22:49 +0100
Subject: [PATCH] Update build scripts

---
 src/scripts/build_ci.sh                   |  2 +-
 src/scripts/build_docker.sh               | 12 ++++++------
 src/scripts/build_vfxplatform.sh          |  2 +-
 src/scripts/build_vfxplatform_friction.sh |  2 +-
 src/scripts/build_vfxplatform_package.sh  | 10 +++++-----
 src/scripts/run_docker.sh                 |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/scripts/build_ci.sh b/src/scripts/build_ci.sh
index e9adc8d78..e7f005856 100755
--- a/src/scripts/build_ci.sh
+++ b/src/scripts/build_ci.sh
@@ -73,7 +73,7 @@ fi
 
 CWD=`pwd`
 MKJOBS=${MKJOBS:-4}
-COMMIT=`git rev-parse --short HEAD`
+COMMIT=`git rev-parse --short=8 HEAD`
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 
 if [ "${BRANCH}" = "main" ]; then
diff --git a/src/scripts/build_docker.sh b/src/scripts/build_docker.sh
index a1a1aa824..bfcdbe059 100755
--- a/src/scripts/build_docker.sh
+++ b/src/scripts/build_docker.sh
@@ -37,13 +37,13 @@ if [ "${DISTRO_ID}" != "ubuntu" ]; then
     exit 1
 fi
 
-DISTRO_VERSION_ID=`cat /etc/os-release | sed '/^VERSION_ID=/!d;s/VERSION_ID=//;s/"//g'`
-DID="${DISTRO_ID}${DISTRO_VERSION_ID}"
+DISTRO_VERSION_ID=`cat /etc/os-release | sed '/^VERSION_CODENAME=/!d;s/VERSION_CODENAME=//;s/"//g;'`
+DID="${DISTRO_ID}-${DISTRO_VERSION_ID}"
 
 FRICTION_ROOT="/friction.graphics"
 FRICTION_DIR="${FRICTION_ROOT}/friction"
 FRICTION_SRC_DIR="${FRICTION_DIR}/src"
-FRICTION_OUT_DIR="/snapshots"
+FRICTION_OUT_DIR="/distfiles/builds"
 
 FRICTION_BRANCH=${FRICTION_BRANCH:-""}
 FRICTION_COMMIT=${FRICTION_COMMIT:-""}
@@ -79,12 +79,12 @@ if [ ! -d "${FRICTION_SRC_DIR}" ]; then
     if [ "${FRICTION_TAG}" != "" ]; then
         (cd friction; git checkout tags/${FRICTION_TAG})
     fi
-    #(cd friction; git submodule update -i docs)
+    (cd friction; git submodule update -i --recursive)
 fi
 
 cd ${FRICTION_DIR}
 
-COMMIT=`git rev-parse --short HEAD`
+COMMIT=`git rev-parse --short=8 HEAD`
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 VERSION="dev"
 
@@ -109,7 +109,7 @@ else
     -DGIT_BRANCH=${BRANCH} \
     ${CMAKE_EXTRA} ..
     VERSION=`cat version.txt`
-    VERSION="${VERSION}-dev-${COMMIT}"
+    VERSION="${VERSION}-${BRANCH}-${COMMIT}"
 fi
 cmake --build .
 
diff --git a/src/scripts/build_vfxplatform.sh b/src/scripts/build_vfxplatform.sh
index 33b990540..4f2fb462f 100755
--- a/src/scripts/build_vfxplatform.sh
+++ b/src/scripts/build_vfxplatform.sh
@@ -78,7 +78,7 @@ ${BUILD}/build_vfxplatform_friction.sh
 # Get Friction version
 VERSION=`cat ${BUILD}/friction/build-vfxplatform/version.txt`
 if [ "${REL}" != 1 ]; then
-    GIT_COMMIT=`(cd ${BUILD}/friction ; git rev-parse --short HEAD)`
+    GIT_COMMIT=`(cd ${BUILD}/friction ; git rev-parse --short=8 HEAD)`
     GIT_BRANCH=`(cd ${BUILD}/friction ; git rev-parse --abbrev-ref HEAD)`
     VERSION="${VERSION}-${GIT_BRANCH}-${GIT_COMMIT}"
 fi
diff --git a/src/scripts/build_vfxplatform_friction.sh b/src/scripts/build_vfxplatform_friction.sh
index 5813f864c..84e7fba60 100755
--- a/src/scripts/build_vfxplatform_friction.sh
+++ b/src/scripts/build_vfxplatform_friction.sh
@@ -78,7 +78,7 @@ cp -a ${SDK}/lib/libunw* /usr/lib64/
 
 CMAKE_EXTRA=""
 
-GIT_COMMIT=`git rev-parse --short HEAD`
+GIT_COMMIT=`git rev-parse --short=8 HEAD`
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 
 if [ "${REL}" != 1 ]; then
diff --git a/src/scripts/build_vfxplatform_package.sh b/src/scripts/build_vfxplatform_package.sh
index f8285e5e1..bd8569dc9 100755
--- a/src/scripts/build_vfxplatform_package.sh
+++ b/src/scripts/build_vfxplatform_package.sh
@@ -40,8 +40,8 @@ if [ ! -d "${BUILD}/${FRICTION_PKG}" ]; then
     exit 1
 fi
 
-if [ ! -d "${DISTFILES}/builds" ]; then
-    mkdir -p ${DISTFILES}/builds
+if [ ! -d "${DISTFILES}/builds/${VERSION}" ]; then
+    mkdir -p ${DISTFILES}/builds/${VERSION}
 fi
 
 export PATH="${SDK}/bin:${PATH}"
@@ -147,7 +147,7 @@ mv ${FRICTION_PKG}.tar ${HOME}/rpmbuild/SOURCES/
 cat ${BUILD}/friction/src/scripts/vfxplatform.spec | sed 's/__FRICTION_PKG_VERSION__/'${PKG_VERSION}'/g;s/__FRICTION_VERSION__/'${VERSION}'/g;s/__APPID__/'${APPID}'/g' > rpm.spec
 
 rpmbuild -bb rpm.spec
-cp -a ${HOME}/rpmbuild/RPMS/*/*.rpm ${DISTFILES}/builds/
+cp -a ${HOME}/rpmbuild/RPMS/*/*.rpm ${DISTFILES}/builds/${VERSION}/
 fi
 
 # Portable
@@ -188,7 +188,7 @@ done
 cd ${BUILD}
 tar cvf ${FRICTION_PORTABLE}.tar ${FRICTION_PORTABLE}
 xz -9 ${FRICTION_PORTABLE}.tar
-cp -a ${FRICTION_PORTABLE}.tar.xz ${DISTFILES}/builds/
+cp -a ${FRICTION_PORTABLE}.tar.xz ${DISTFILES}/builds/${VERSION}/
 
 # AppImage
 if [ "${PKG_APP}" = 1 ]; then
@@ -208,7 +208,7 @@ if [ ! -f "${DISTFILES}/appimagetool.tar.xz" ]; then
 fi
 tar xf ${DISTFILES}/appimagetool.tar.xz
 ARCH=x86_64 ./appimagetool/AppRun ${FRICTION_PORTABLE}
-cp -a *.AppImage ${DISTFILES}/builds/
+cp -a *.AppImage ${DISTFILES}/builds/${VERSION}/
 fi
 
 echo "FRICTION PACKAGE DONE"
diff --git a/src/scripts/run_docker.sh b/src/scripts/run_docker.sh
index 97750e9c1..540a54b01 100755
--- a/src/scripts/run_docker.sh
+++ b/src/scripts/run_docker.sh
@@ -26,15 +26,15 @@ REL=${REL:-0}
 BRANCH=${BRANCH:-""}
 COMMIT=${COMMIT:-""}
 TAG=${TAG:-""}
-MKJOBS=${JOBS:-4}
+MKJOBS=${MKJOBS:-4}
 
 JAMMY=${JAMMY:-1}
 MANTIC=${MANTIC:-1}
 NOBLE=${NOBLE:-1}
 
-MOUNT_DIR="snapshots"
+MOUNT_DIR="distfiles"
 DOCKER_MOUNT="-t --mount type=bind,source=${CWD}/${MOUNT_DIR},target=/${MOUNT_DIR}"
-DOCKER="docker run -e REL=${REL} -e MKJOBS=${JOBS}"
+DOCKER="docker run -e REL=${REL} -e MKJOBS=${MKJOBS}"
 
 if [ "${BRANCH}" != "" ]; then
     DOCKER="${DOCKER} -e FRICTION_BRANCH=${BRANCH}"