Update to spice2x-26-02-17 (completed)
> adjust cmake.sh (ignore separate linux targets) > adjust .gitignore
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
.vscode/*
|
.vscode/*
|
||||||
|
|
||||||
# JetBrains IDEs
|
# JetBrains IDEs
|
||||||
.idea
|
|
||||||
.idea_modules
|
.idea_modules
|
||||||
*.iws
|
*.iws
|
||||||
|
|
||||||
|
|||||||
@@ -11,10 +11,11 @@ GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "none")
|
|||||||
GIT_HEAD=$(git rev-parse --short HEAD || echo "none")
|
GIT_HEAD=$(git rev-parse --short HEAD || echo "none")
|
||||||
BUILD_TYPE=$({ $_G_debug && echo Debug; } || echo Release)
|
BUILD_TYPE=$({ $_G_debug && echo Debug; } || echo Release)
|
||||||
OUTDIR="$_G_bindir/${BUILD_TYPE}"
|
OUTDIR="$_G_bindir/${BUILD_TYPE}"
|
||||||
|
OUTDIR_EXTRAS="$OUTDIR/extras"
|
||||||
DIST_FOLDER="$_G_bindir/Distribution"
|
DIST_FOLDER="$_G_bindir/Distribution"
|
||||||
DIST_NAME="${GIT_BRANCH}-${GIT_HEAD}.zip"
|
DIST_NAME="${GIT_BRANCH}-${GIT_HEAD}.zip"
|
||||||
DIST_COMMENT="$(date +%Y)/$(date +%m)/$(date +%d):$(git rev-parse HEAD)"
|
DIST_COMMENT="$(date +%Y)/$(date +%m)/$(date +%d):$(git rev-parse HEAD)"
|
||||||
: ${DIST_ENABLE:=$({ $_G_debug && echo 0; } || echo 1)}
|
DIST_ENABLE=0
|
||||||
UPX_ENABLE="$DIST_ENABLE"
|
UPX_ENABLE="$DIST_ENABLE"
|
||||||
IGNORE_CACHE=0
|
IGNORE_CACHE=0
|
||||||
INCLUDE_SRC=0
|
INCLUDE_SRC=0
|
||||||
@@ -22,34 +23,30 @@ UPX_FLAGS="-q --best --lzma --compress-exports=0"
|
|||||||
CLEAN_BUILD=$({ $_G_clean && echo 1; } || echo 0)
|
CLEAN_BUILD=$({ $_G_clean && echo 1; } || echo 0)
|
||||||
DEBUG=$({ $_G_debug && echo 1; } || echo 0)
|
DEBUG=$({ $_G_debug && echo 1; } || echo 0)
|
||||||
TOOLCHAIN_32="external/cmake-various/toolchain/toolchain-mingw_nix-win-x86.cmake"
|
TOOLCHAIN_32="external/cmake-various/toolchain/toolchain-mingw_nix-win-x86.cmake"
|
||||||
TARGETS_32="spicetools_stubs_kbt spicetools_stubs_kld spicetools_cfg spicetools_spice"
|
TARGETS_32="spicetools_stubs_kbt spicetools_stubs_kld spicetools_cfg spicetools_spice spicetools_spice_laa spicetools_stubs_cpusbxpkm"
|
||||||
BUILDDIR_32="$_G_buildir/x86/${BUILD_TYPE}"
|
BUILDDIR_32="$_G_buildir/x86/${BUILD_TYPE}"
|
||||||
TOOLCHAIN_64="external/cmake-various/toolchain/toolchain-mingw_nix-win-x64.cmake"
|
TOOLCHAIN_64="external/cmake-various/toolchain/toolchain-mingw_nix-win-x64.cmake"
|
||||||
TARGETS_64="spicetools_stubs_kbt64 spicetools_stubs_kld64 spicetools_spice64"
|
TARGETS_64="spicetools_stubs_kbt64 spicetools_stubs_kld64 spicetools_spice64 spicetools_stubs_nvEncodeAPI64 spicetools_stubs_nvcuvid spicetools_stubs_nvcuda"
|
||||||
BUILDDIR_64="$_G_buildir/x64/${BUILD_TYPE}"
|
BUILDDIR_64="$_G_buildir/x64/${BUILD_TYPE}"
|
||||||
__BUILDALLINIT__
|
__BUILDALLINIT__
|
||||||
|
|
||||||
run_build_all() {
|
run_build_all() {
|
||||||
DIST_ENABLE=0
|
|
||||||
|
|
||||||
# Init build_all.sh
|
# Init build_all.sh
|
||||||
source <(sed -n '/__BUILDALLINIT__/{:a;n;/__BUILDALLINIT__/q;p;$!ba}' "$0")
|
source <(sed -n '/__BUILDALLINIT__/{:a;n;/__BUILDALLINIT__/q;p;$!ba}' "$0")
|
||||||
source <(head -n +20 ./build_all.sh)
|
source <(head -n +20 ./build_all.sh)
|
||||||
|
|
||||||
# Run build_all.sh
|
# Run build_all.sh
|
||||||
source <(tail -n +78 ./build_all.sh | head -n -3 | sed -e 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~' -e 's~mkdir -p ${OUTDIR}/src~~')
|
source <(tail -n +80 ./build_all.sh | head -n -3 | sed -e 's~mkdir -p ${OUTDIR}/src~~' -e '/linux/d')
|
||||||
}
|
}
|
||||||
|
|
||||||
run_deploy_all() {
|
run_deploy_all() {
|
||||||
DIST_ENABLE=0
|
|
||||||
|
|
||||||
# Init build_all.sh
|
# Init build_all.sh
|
||||||
source <(sed -n '/__BUILDALLINIT__/{:a;n;/__BUILDALLINIT__/q;p;$!ba}' "$0")
|
source <(sed -n '/__BUILDALLINIT__/{:a;n;/__BUILDALLINIT__/q;p;$!ba}' "$0")
|
||||||
source <(head -n +20 ./build_all.sh)
|
source <(head -n +20 ./build_all.sh)
|
||||||
|
|
||||||
# Run deploy in build_all.sh
|
# Run deploy in build_all.sh
|
||||||
set +e
|
set +e
|
||||||
source <(tail -n +180 ./build_all.sh | head -n -3 | sed -e 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~' -e 's~mkdir -p ${OUTDIR}/src~~')
|
source <(tail -n +182 ./build_all.sh | head -n -3 | sed -e 's~mkdir -p ${OUTDIR}/src~~' -e '/linux/d')
|
||||||
}
|
}
|
||||||
|
|
||||||
run_distribute_all() {
|
run_distribute_all() {
|
||||||
@@ -58,12 +55,20 @@ run_distribute_all() {
|
|||||||
source <(head -n +20 ./build_all.sh)
|
source <(head -n +20 ./build_all.sh)
|
||||||
|
|
||||||
# Run deploy in build_all.sh
|
# Run deploy in build_all.sh
|
||||||
source <(tail -n +180 ./build_all.sh | head -n -3 | sed -e 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~' -e 's~mkdir -p ${OUTDIR}/src~~')
|
source <(tail -n +182 ./build_all.sh | head -n -3 | sed -e 's~mkdir -p ${OUTDIR}/src~~' -e '/linux/d')
|
||||||
|
|
||||||
|
# Use old distribute logic
|
||||||
|
echo "Building dist..."
|
||||||
|
mkdir -p ${DIST_FOLDER}
|
||||||
|
rm -rf ${DIST_FOLDER}/${DIST_NAME}
|
||||||
|
pushd ${OUTDIR} > /dev/null
|
||||||
|
zip -qrXT9 $OLDPWD/${DIST_FOLDER}/${DIST_NAME} . -z <<< "$DIST_COMMENT"
|
||||||
|
popd > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
# Sanity checks
|
# Sanity checks
|
||||||
[ -d "external/cmake-various/toolchain" ] || { echo "Toolchain not found" ; exit 1; }
|
[ -d "external/cmake-various/toolchain" ] || { echo "Toolchain not found" ; exit 1; }
|
||||||
[ "$(md5sum ./build_all.sh | cut -c -32)" = "652956b12cf63f2c7900c1a9b36bc031" ] || { echo "Version mismatch for build_all.sh " ; exit 1; }
|
[ "$(md5sum ./build_all.sh | cut -c -32)" = "5c5d7152a1bff96962223458fdf690a2" ] || { echo "Version mismatch for build_all.sh " ; exit 1; }
|
||||||
|
|
||||||
# Run requested task
|
# Run requested task
|
||||||
if [[ $(type -t "run_${1}_${2}") == function ]]; then
|
if [[ $(type -t "run_${1}_${2}") == function ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user