Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
2e7c7ec1d7
|
|||
99f0b83ac7
|
|||
9cc7d052dd
|
|||
abefcf8fe2
|
|||
015bc8a666
|
|||
546d8718d2
|
|||
a65685de5c
|
|||
f9af39e058
|
20
.build.yml
20
.build.yml
@@ -1,8 +1,14 @@
|
||||
kind: pipeline
|
||||
type: exec
|
||||
name: XT Toolchain Pipeline
|
||||
|
||||
steps:
|
||||
- name: Compile XT Toolchain
|
||||
pipeline:
|
||||
build:
|
||||
image: codingworkshop/oscw-runner:latest
|
||||
commands:
|
||||
- sh build-linux.sh
|
||||
- CORES=10 ./build-linux.sh
|
||||
publish:
|
||||
image: codingworkshop/oscw-runner:latest
|
||||
secrets:
|
||||
- OSCW_GITHUB_USERNAME
|
||||
- OSCW_GITHUB_PASSWORD
|
||||
when:
|
||||
event: tag
|
||||
commands:
|
||||
- github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst)
|
||||
|
@@ -18,12 +18,12 @@ GENERIC="generic-w64-mingw32"
|
||||
|
||||
# CMake Settings
|
||||
CMAKEDIR="${SRCDIR}/cmake"
|
||||
CMAKETAG="v3.23.1"
|
||||
CMAKETAG="v3.24.2"
|
||||
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
|
||||
|
||||
# LLVM Settings
|
||||
LLVMDIR="${SRCDIR}/llvm"
|
||||
LLVMTAG="llvmorg-14.0.6"
|
||||
LLVMTAG="llvmorg-15.0.2"
|
||||
LLVMVCS="https://github.com/llvm/llvm-project.git"
|
||||
|
||||
# Make Settings
|
||||
@@ -34,7 +34,7 @@ MAKEVCS="git://git.savannah.gnu.org/make"
|
||||
# Mingw-w64 Settings
|
||||
MINGWDIR="${SRCDIR}/mingw-w64"
|
||||
MINGWLIB="ucrt"
|
||||
MINGWTAG="v10.0.0"
|
||||
MINGWTAG="master"
|
||||
MINGWNTV="0x601"
|
||||
MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
||||
|
||||
@@ -145,7 +145,7 @@ llvm_build()
|
||||
-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
|
||||
-DLLVM_LINK_LLVM_DYLIB=ON \
|
||||
-DLLVM_TARGETS_TO_BUILD="$(echo ${LLVM_ARCHS[@]} | tr ' ' ';')" \
|
||||
-DLLVM_TOOLCHAIN_TOOLS="llvm-addr2line;llvm-ar;llvm-as;llvm-cov;llvm-cvtres;llvm-dlltool;llvm-ml;llvm-nm;llvm-objdump;llvm-objcopy;llvm-pdbutil;llvm-profdata;llvm-ranlib;llvm-rc;llvm-readelf;llvm-readobj;llvm-strings;llvm-strip;llvm-symbolizer;llvm-windres" \
|
||||
-DLLVM_TOOLCHAIN_TOOLS="llvm-addr2line;llvm-ar;llvm-as;llvm-cov;llvm-cvtres;llvm-dlltool;llvm-lib;llvm-ml;llvm-nm;llvm-objdump;llvm-objcopy;llvm-pdbutil;llvm-profdata;llvm-ranlib;llvm-rc;llvm-readelf;llvm-readobj;llvm-strings;llvm-strip;llvm-symbolizer;llvm-windres" \
|
||||
..
|
||||
make -j${CORES} install/strip
|
||||
cd ${WRKDIR}
|
||||
@@ -385,7 +385,9 @@ mingw_fetch()
|
||||
echo ">>> Downloading MinGW-w64 ..."
|
||||
git clone ${MINGWVCS} ${MINGWDIR}
|
||||
cd ${MINGWDIR}
|
||||
if [ x"${MINGWTAG}" != x"master" ]; then
|
||||
git checkout tags/${MINGWTAG}
|
||||
fi
|
||||
apply_patches ${MINGWDIR##*/} ${MINGWTAG}
|
||||
cd ${WRKDIR}
|
||||
fi
|
||||
@@ -448,6 +450,7 @@ wine_build()
|
||||
cd ${WINEDIR}/build
|
||||
../configure \
|
||||
-enable-win64 \
|
||||
--without-freetype \
|
||||
--without-x
|
||||
for TOOL in winedump wmc wrc; do
|
||||
make -j${CORES} tools/${TOOL}/all
|
||||
@@ -507,16 +510,12 @@ xtchain_build()
|
||||
# Exit immediately on any failure
|
||||
set -e
|
||||
|
||||
# Check if script launched as root
|
||||
if [ "$(whoami)" = "root" ]; then
|
||||
echo "This script cannot be run as root!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check number of CPU cores available
|
||||
if [[ ! -n ${CORES} ]]; then
|
||||
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
||||
: ${CORES:=$(nproc 2>/dev/null)}
|
||||
: ${CORES:=1}
|
||||
fi
|
||||
|
||||
# Create working directories
|
||||
mkdir -p ${BINDIR}
|
||||
|
13
patches/cmake/v3.24.2/001-add-xtc-version-suffix.patch
Normal file
13
patches/cmake/v3.24.2/001-add-xtc-version-suffix.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
|
||||
index 818109f0b7..749377d193 100644
|
||||
--- a/Source/CMakeVersion.cmake
|
||||
+++ b/Source/CMakeVersion.cmake
|
||||
@@ -7,7 +7,7 @@ set(CMake_VERSION_IS_DIRTY 0)
|
||||
|
||||
# Start with the full version number used in tags. It has no dev info.
|
||||
set(CMake_VERSION
|
||||
- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
|
||||
+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}-XTC")
|
||||
if(DEFINED CMake_VERSION_RC)
|
||||
set(CMake_VERSION "${CMake_VERSION}-rc${CMake_VERSION_RC}")
|
||||
endif()
|
File diff suppressed because it is too large
Load Diff
@@ -6,12 +6,6 @@
|
||||
# DEVELOPERS: Rafal Kupiec <belliash@codingworkshop.eu.org>
|
||||
|
||||
|
||||
# Check if script launched as root
|
||||
if [ "$(whoami)" = "root" ]; then
|
||||
echo "This script cannot be run as root!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get the absolute path to the XTchain
|
||||
export XTCDIR="$(realpath $(dirname ${0}))"
|
||||
|
||||
|
Reference in New Issue
Block a user