Add exetool for modifying PE/COFF image subsystem

Co-authored-by: belliash <belliash@codingworkshop.eu.org>
Reviewed-on: xt-sys/xtchain#3
Reviewed-by: Piotr Likoski <likoski@noreply.codingworkshop.git>

.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)

build-linux.sh

@@ -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.6"
 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
@@ -499,6 +502,7 @@ xtchain_build()
             ln -sf ${EXEC} ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
         done
     done
+    cp ${WRKDIR}/scripts/exetool ${BINDIR}/bin/
     cp ${WRKDIR}/scripts/xtclib ${BINDIR}/lib/xtchain/
     cp ${WRKDIR}/scripts/xtchain ${BINDIR}/
 }
@@ -507,16 +511,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}

patches/cmake/v3.24.2/001-add-xtc-version-suffix.patch

@@ -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()

scripts/exetool

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+
+import sys
+import struct
+
+if len(sys.argv) < 3:
+    print("XTChain ExeTool for modifying PE/COFF image subsystem\nNot sufficient parametrs. '[PE/COFF Image File]' '[SubSystem]'")
+    sys.exit(1)
+
+ImageFile = sys.argv[1]
+Subsystem = sys.argv[2].upper()
+
+# Set proper subsystem
+if Subsystem == "UNKNOWN":
+    ImageSubsystem = 0x00
+elif Subsystem == "NT_NATIVE":
+    ImageSubsystem = 0x01
+elif Subsystem == "WINDOWS_GUI":
+    ImageSubsystem = 0x02
+elif Subsystem == "WINDOWS_CLI":
+    ImageSubsystem = 0x03
+elif Subsystem == "WINDOWS_CE_OLD":
+    ImageSubsystem = 0x04
+elif Subsystem == "OS2_CUI":
+    ImageSubsystem = 0x05
+elif Subsystem == "POSIX_CUI":
+    ImageSubsystem = 0x07
+elif Subsystem == "NATIVE_WINDOWS":
+    ImageSubsystem = 0x08
+elif Subsystem == "WINDOWS_CE_GUI":
+    ImageSubsystem = 0x09
+elif Subsystem == "EFI_APPLICATION":
+    ImageSubsystem = 0x0A
+elif Subsystem == "EFI_BOOT_SERVICE_DRIVER":
+    ImageSubsystem = 0x0B
+elif Subsystem == "EFI_RUNTIME_DRIVER":
+    ImageSubsystem = 0x0C
+elif Subsystem == "EFI_ROM":
+    ImageSubsystem = 0x0D
+elif Subsystem == "XBOX":
+    ImageSubsystem = 0x0E
+elif Subsystem == "WINDOWS_BOOT_APPLICATION":
+    ImageSubsystem = 0x10
+elif Subsystem == "XT_NATIVE_KERNEL":
+    ImageSubsystem = 0x14
+elif Subsystem == "XT_NATIVE_APPLICATION":
+    ImageSubsystem = 0x15
+elif Subsystem == "XT_NATIVE_DRIVER":
+    ImageSubsystem = 0x16
+elif Subsystem == "XT_DYNAMIC_LIBRARY":
+    ImageSubsystem = 0x17
+elif Subsystem == "XT_APPLICATION_CLI":
+    ImageSubsystem = 0x18
+elif Subsystem == "XT_APPLICATION_GDI":
+    ImageSubsystem = 0x19
+else:
+    print("Invalid subsystem privided")
+    exit(2)
+
+# Open PE/COFF image file
+PeImage = open(sys.argv[1], "r+b")
+
+# Get PE header
+PeImage.seek(0x3C)
+(PeHeader,)=struct.unpack("H", PeImage.read(2))
+
+# Get PE signature
+PeImage.seek(PeHeader)
+(PeSignature,)=struct.unpack("I", PeImage.read(4))
+if PeSignature != 0x4550:
+    print("Invalid or corrupted PE header")
+
+# Set new image subsystem
+PeImage.seek(PeHeader + 0x5C)
+print("Setting subsystem to " + str(ImageSubsystem))
+PeImage.write(struct.pack("H", ImageSubsystem))
+
+# Close PE/COFF image file
+PeImage.close()

scripts/xtchain

@@ -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}))"