unsorted changes for Windows port

.gitignore

@@ -1,3 +1,17 @@
 build
 **/pkg
 **/src
+
+*.sample
+*.zst
+
+config
+description
+FETCH_HEAD
+HEAD
+packed-refs
+exclude
+*.idx
+*.pack
+*.xz
+*.gz

build-package.sh

@@ -26,8 +26,15 @@ build_package_native() {
 	sh -c 'pacman -Syu && su -c "cd /wf/packages/'$PKGNAME' && makepkg -C --clean --syncdeps --force --noconfirm --skippgpcheck '$PKGNAME'" wfbuilder'
 }
 
+build_package_windows() {
+	cd /wf/packages/"$PKGNAME"
+	makepkg -C --clean --syncdeps --force --noconfirm --skippgpcheck '$PKGNAME'
+}
+
 if [[ z"$1" == "znative" ]]; then
 	build_package_native
+elif [[ z"$1" == "zwindows" ]]; then
+	build_package_windows
 elif [[ z"$1" == "z" || z"$1" == "zall" ]]; then
 	if grep -q "arch=(any)" packages/$PKGNAME/PKGBUILD; then
 		build_package x86_64

config/runtime-env-vars.sh

@@ -9,6 +9,17 @@ WF_DESTDIR="/"
 WF_USE_MUSL=true
 WF_LIBRARY_SUFFIX=.so
 
+MINGW_WINDOWS=false
+
+case `uname` in MINGW*)
+	WF_USE_MUSL=false
+	WF_LIBRARY_SUFFIX=.dll
+	WF_DESTDIR="/opt/wonderful/"
+
+	MINGW_WINDOWS=true
+	WF_LUA_LDFLAGS=-llua
+esac
+
 WF_RUNTIME_LDFLAGS="-Wl,-rpath,$WF_PATH/lib -Wl,--dynamic-linker=$WF_PATH/lib/ld-musl-$CARCH.so.1"
 
 WF_RUNTIME_INCLUDES="-I$WF_PATH/include"

packages/runtime-gcc-libs-dummy/PKGBUILD

@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: CC0-1.0
+#
+# SPDX-FileContributor: Adrian "asie" Siekierka, 2023
+
+pkgname=(runtime-gcc-libs)
+pkgver=0.3.18
+pkgrel=1
+epoch=
+pkgdesc="GCC runtime libraries (dummy)"
+arch=("i686" "x86_64" "armv6h" "aarch64")
+url=""
+license=("GPL-3.0-or-later")
+source=()
+sha256sums=()
+groups=(wonderful-base)
+
+package() {
+}

packages/runtime-musl-dummy/PKGBUILD

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: CC0-1.0
+#
+# SPDX-FileContributor: Adrian "asie" Siekierka, 2023
+
+pkgname=(runtime-musl runtime-musl-dev)
+pkgver=1.2.4
+pkgrel=1
+epoch=
+pkgdesc="musl runtime (dummy)"
+arch=("i686" "x86_64" "armv6h" "aarch64")
+license=("MIT")
+source=()
+sha256sums=()
+
+prepare() {
+	true
+}
+
+package_runtime-musl() {
+	groups=(wonderful-base)
+}
+
+package_runtime-musl-dev() {
+	pkgdesc="musl runtime development files (dummy)"
+	depends=(runtime-musl)
+}

packages/target-wswan-syslibs/PKGBUILD

@@ -22,12 +22,13 @@ options=(!strip)
 . "../templates/git-pkgver.PKGBUILD"
 
 build() {
+	CFLAGS=""
 	cd "$pkgname"
 	./build.sh
 }
 
 package() {
 	cd "$pkgname"
-	mkdir -p "$pkgdir"
+	mkdir -p "$pkgdir$WF_DESTDIR"
 	cp -aR build/target "$pkgdir$WF_DESTDIR"
 }

packages/templates/luarocks-package.PKGBUILD

@@ -3,9 +3,14 @@
 # SPDX-FileContributor: Adrian "asie" Siekierka, 2023
 
 build_luarocks() {
-	luarocks-5.4 \
-		LDFLAGS="$WF_RUNTIME_LDFLAGS" \
-		LUA_INCDIR="$WF_PATH"/include \
-		LUA_LIBDIR="$WF_PATH"/lib/lua/5.4 \
-		make --tree=./build "$pkgrock".rockspec
+	if [ "$MINGW_WINDOWS" == "true" ]; then
+		luarocks \
+			make --tree=./build "$pkgrock".rockspec
+	else
+		luarocks-5.4 \
+			LDFLAGS="$WF_RUNTIME_LDFLAGS" \
+			LUA_INCDIR="$WF_PATH"/include \
+			LUA_LIBDIR="$WF_PATH"/lib/lua/5.4 \
+			make --tree=./build "$pkgrock".rockspec
+	fi
 }

packages/toolchain-gcc-ia16-elf-binutils/PKGBUILD

@@ -12,8 +12,8 @@ arch=("i686" "x86_64")
 url="https://github.com/WonderfulToolchain/binutils-ia16"
 license=("GPL-3.0-or-later")
 source=("$pkgname::git+https://github.com/WonderfulToolchain/binutils-ia16#branch=binutils-2_39-ia16")
-depends=(runtime-musl)
-makedepends=(runtime-musl-dev)
+depends=()
+makedepends=()
 groups=(toolchain-gcc-ia16-elf)
 sha256sums=('SKIP')
 

packages/toolchain-gcc-ia16-elf-gcc/PKGBUILD

@@ -50,6 +50,12 @@ prepare() {
 
 build() {
 	cd gcc-build
+
+	# workaround for https://gcc.gnu.org/bugzilla//show_bug.cgi?id=108300
+	if [ "$MINGW_WINDOWS" == "true" ]; then
+		CPPFLAGS='-DWIN32_LEAN_AND_MEAN'
+	fi
+
 	../"$pkgname"/configure \
 		--prefix="/opt/wonderful/toolchain/gcc-ia16-elf" \
 		--target=ia16-elf \

packages/wf-lua-iconv/PKGBUILD

@@ -33,19 +33,29 @@ prepare() {
 		sed -i -E -e "s/check_one\(termcs, \"EBCDIC/-- EBCDIC/g" test_iconv.lua
 		# musl does not output EILSEQ.
 		sed -i -E -e "s/assert\(e == iconv.ERROR_INVALID/-- ERROR_INVALID/g" test_iconv.lua
+	elif [ "$MINGW_WINDOWS" == "true" ]; then
+		# mingw iconv only recognises them with a dash
+		sed -i -E -e "s/\"utf8\"/\"utf-8\"/g" test_iconv.lua
+		sed -i -E -e "s/\"utf16\"/\"utf-16\"/g" test_iconv.lua
 	fi
 }
 
 build() {
 	cd "$pkgname"
 
-	gcc -c -o iconv.lo $WF_RUNTIME_INCLUDES -fPIC -O3 -Wall luaiconv.c
-	gcc -o iconv"$WF_LIBRARY_SUFFIX" -shared $WF_LUA_LDFLAGS iconv.lo
+	gcc -c -o iconv.lo $WF_RUNTIME_INCLUDES -O3 -Wall luaiconv.c
+
+	if [ "$MINGW_WINDOWS" == "true" ]; then
+		EXPLICIT_ICONV_LINK="-liconv"
+	fi
+
+	gcc -o iconv"$WF_LIBRARY_SUFFIX" -shared iconv.lo "$WF_LUA_LDFLAGS" "$EXPLICIT_ICONV_LINK"
 }
 
 check() {
 	cd "$pkgname"
 
+	export LUA_CPATH="C:/msys64/wf/packages/wf-lua-iconv/src/wf-lua-iconv/?.dll"
 	$WF_PATH/bin/wf-lua test_iconv.lua
 }
 

packages/wf-lua-windows/PKGBUILD

@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: CC0-1.0
+#
+# SPDX-FileContributor: Adrian "asie" Siekierka, 2023
+
+pkgname=(wf-lua wf-lua-dev)
+pkgver=5.4.0
+pkgrel=1
+epoch=
+pkgdesc="Lua scripting language"
+arch=("i686" "x86_64" "armv6h" "aarch64")
+url="https://www.lua.org"
+license=("MIT")
+source=(
+    "wf-lua"
+    "wf-luac"
+)
+depends=(mingw-w64-x86_64-lua)
+makedepends=()
+sha256sums=(
+    "SKIP"
+    "SKIP"
+)
+
+. "/wf/config/runtime-env-vars.sh"
+
+package_wf-lua() {
+	mkdir -p "$pkgdir$WF_DESTDIR"/bin
+	cp -a "$srcdir"/wf-lua "$pkgdir$WF_DESTDIR"/bin/wf-lua
+	cp -a "$srcdir"/wf-luac "$pkgdir$WF_DESTDIR"/bin/wf-luac
+}
+
+package_wf-lua-dev() {
+    true
+}

packages/wf-lua-windows/wf-lua

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export LUA_PATH="/opt/wonderful/lib/lua/5.4/?.lua;$LUA_PATH"
+export LUA_CPATH="/opt/wonderful/lib/lua/5.4/?.dll;$LUA_CPATH"
+
+lua "$@"

packages/wf-lua-windows/wf-luac

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export LUA_PATH="/opt/wonderful/lib/lua/5.4/?.lua"
+export LUA_CPATH="/opt/wonderful/lib/lua/5.4/?.dll"
+
+luac "$@"