From f3a428fbdd8d217c8c111481cb8a6b0e0823e240 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 23 Nov 2023 19:02:07 +0900 Subject: [PATCH] Fix up windows and the release scripts I really need more feedback and the best way to get that is to have more users, and for that, I need packages. --- Makefile.am | 1 + ruamoko/cl_menu/Makemodule.am | 15 ++++++++----- tools/build_scripts/qf-release | 21 +++++++++++------- tools/build_scripts/qf-win32.py | 33 ++++++++++------------------ tools/cross/mingw/cross-configure.sh | 1 + 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7817cffe3..0bd3baaeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,6 +144,7 @@ SUFFICES += .plist .plc @$(mkdir_p) $(builddir)/`dirname $@` $(V_GLSLANG)(((($(GLSLANGVALIDATOR) --vn `basename $< | tr . _` -V $< -o $@; echo $$? >&3) | sed -e '1d' 1>&2) 3>&1) | (read xs; exit $$xs)) +sharepath = @sharepath@ shaderdir = @shaderdir@ shader_DATA = diff --git a/ruamoko/cl_menu/Makemodule.am b/ruamoko/cl_menu/Makemodule.am index 90dcbb5ba..a9e204686 100644 --- a/ruamoko/cl_menu/Makemodule.am +++ b/ruamoko/cl_menu/Makemodule.am @@ -1,7 +1,10 @@ -ruamoko_cl_menu_libexec=ruamoko/cl_menu/menu.dat$(EXEEXT) -ruamoko_cl_menu_data=ruamoko/cl_menu/menu.plist ruamoko/cl_menu/menu.sym +ruamoko_cl_menu_libexec=ruamoko/cl_menu/menu_dat$(EXEEXT) +ruamoko_cl_menu_data=\ + ruamoko/cl_menu/menu.dat \ + ruamoko/cl_menu/menu.plist \ + ruamoko/cl_menu/menu.sym -ruamoko_cl_menudir = @sharepath@/QF +ruamoko_cl_menudir = ${sharepath}/QF ruamoko_cl_menu_DATA = $(ruamoko_cl_menu_data) ruamoko_cl_menu_PROGRAMS = $(ruamoko_cl_menu_libexec) EXTRA_PROGRAMS += $(ruamoko_cl_menu_libexec) @@ -36,12 +39,14 @@ ruamoko_menu_src= \ ruamoko_cl_menu_menu_dat_SOURCES=$(ruamoko_menu_src) ruamoko_menu_obj=$(ruamoko_cl_menu_menu_dat_SOURCES:.r=.o) ruamoko_menu_dep=$(call qcautodep,$(ruamoko_cl_menu_menu_dat_SOURCES)) -ruamoko/cl_menu/menu.dat$(EXEEXT): $(ruamoko_menu_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a ruamoko/gui/libgui.a +ruamoko/cl_menu/menu_dat$(EXEEXT): ruamoko/cl_menu/menu.dat + cp $^ $@ +ruamoko/cl_menu/menu.dat: $(ruamoko_menu_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a ruamoko/gui/libgui.a $(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr include $(ruamoko_menu_dep) # am--include-marker r_depfiles_remade += $(ruamoko_menu_dep) -ruamoko/cl_menu/menu.sym: ruamoko/cl_menu/menu.dat$(EXEEXT) +ruamoko/cl_menu/menu.sym: ruamoko/cl_menu/menu.dat EXTRA_DIST += \ ruamoko/cl_menu/CrosshairCvar.h \ diff --git a/tools/build_scripts/qf-release b/tools/build_scripts/qf-release index 417b8c4e0..6b6972dc7 100755 --- a/tools/build_scripts/qf-release +++ b/tools/build_scripts/qf-release @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/bash -x . ~/.bash_profile @@ -53,14 +53,14 @@ else do_win32=1 fi -git_url=${git_url:-git://git.quakeforge.net/gitroot/quake/quakeforge} +git_url=${git_url:-https://github.com/quakeforge/quakeforge.git} mkdir -p $RELEASE cd $RELEASE if test $no_rm -ne 1; then rm -rf NEWS io_mesh_qfmdl-* quakeforge-* qfcc-* quakeforge_* qfcc_* fi -git clone $git_url || true +git clone --depth 1 $git_url || true ver=`(cd quakeforge; config.d/git-version-gen --prefix '' .tarball-version)` mv quakeforge quakeforge-$ver cd quakeforge-$ver @@ -113,24 +113,29 @@ if test $do_win32 -eq 1; then ../tools/cross/mingw64/cross-configure.sh \ --disable-debug \ --program-prefix= - ../tools/cross/mingw/cross-make.sh $QFSMP \ + ../tools/cross/mingw/cross-make.sh $QFSMP + ../tools/cross/mingw/cross-make.sh \ prefix=${qf_win32_dir} \ exec_prefix=${qf_win32_dir} \ pkgdatadir=${qf_win32_dir}/QF \ + sharepath=${qf_win64_dir}/QF \ man1dir=${qf_win32_dir} \ install ../tools/cross/mingw64/cross-make.sh $QFSMP \ prefix=${qf_win64_dir} \ exec_prefix=${qf_win64_dir} \ pkgdatadir=${qf_win64_dir}/QF \ + sharepath=${qf_win64_dir}/QF \ man1dir=${qf_win64_dir} \ install mkdir -p ${qf_win32_dir}/pkgconfig ${qf_win64_dir}/pkgconfig - mv ${qf_win32_dir}/QF/*.pc ${qf_win32_dir}/pkgconfig - mv ${qf_win64_dir}/QF/*.pc ${qf_win64_dir}/pkgconfig + mv ${qf_win32_dir}/lib/pkgconfig/*.pc ${qf_win32_dir}/pkgconfig + mv ${qf_win64_dir}/lib/pkgconfig/*.pc ${qf_win64_dir}/pkgconfig eval `grep MINGW= ../tools/cross/mingw/cross-configure.sh` - $MINGW/usr/bin/i686-pc-mingw32-strip --strip-unneeded "$qf_win32"/bin/*.exe - $MINGW/usr/bin/x86_64-w64-mingw32-strip --strip-unneeded "$qf_win64"/bin/*.exe + MGWi686=i686-w64-mingw32.static + MGWx86_64=x86_64-w64-mingw32.static + $MINGW/usr/bin/$MGWi686-strip --strip-unneeded "$qf_win32"/bin/*.exe + $MINGW/usr/bin/$MGWx86_64-strip --strip-unneeded "$qf_win64"/bin/*.exe ../tools/build_scripts/qf-win32.py "$ver-win32" quakeforge "$qf_win32" ../tools/build_scripts/qf-win32.py "$ver-win64" quakeforge "$qf_win64" mv *.zip $RELEASE diff --git a/tools/build_scripts/qf-win32.py b/tools/build_scripts/qf-win32.py index 21977b20e..ffc5a9c9c 100755 --- a/tools/build_scripts/qf-win32.py +++ b/tools/build_scripts/qf-win32.py @@ -6,11 +6,11 @@ version = "" prefix = "qf-win32" dir = prefix -if len (sys.argv) >= 2: +if len(sys.argv) >= 2: version = "-" + sys.argv[1] -if len (sys.argv) >= 3: +if len(sys.argv) >= 3: prefix = sys.argv[2] -if len (sys.argv) >= 4: +if len(sys.argv) >= 4: dir = sys.argv[3] if dir and dir[-1] != '/': @@ -26,21 +26,11 @@ server = [ dir + "bin/qtv.exe", ] -#client_wgl = [ -# dir, -# dir + "bin", -# dir + "bin/nq-wgl.exe", -# dir + "bin/qw-client-wgl.exe", -# dir + "QF", -# dir + "QF/menu.dat.gz", -# dir + "QF/menu.plist", -#] - -client_sdl = [ +client_win = [ dir, dir + "bin", - dir + "bin/nq-sdl.exe", - dir + "bin/qw-client-sdl.exe", + dir + "bin/nq-win.exe", + dir + "bin/qw-client-win.exe", dir + "QF", dir + "QF/menu.dat.gz", dir + "QF/menu.plist", @@ -85,8 +75,7 @@ devel_r = [ packages = [ (prefix + "-" + "server", server), - #(prefix + "-" + "client-wgl", client_wgl), - (prefix + "-" + "client-sdl", client_sdl), + (prefix + "-" + "client-win", client_win), (prefix + "-" + "tools", tools), (prefix + "-" + "devel", devel), (prefix + "-" + "devel", devel_r, "-r"), @@ -96,8 +85,8 @@ packages = [ for p in packages: opt = "" - if len (p) >= 3: + if len(p) >= 3: opt = p[2] + " " - cmd = "zip -9 " + opt + p[0] + version + ".zip " + " ".join (p[1]) - print cmd - system (cmd) + cmd = "zip -9 " + opt + p[0] + version + ".zip " + " ".join(p[1]) + print(cmd) + system(cmd) diff --git a/tools/cross/mingw/cross-configure.sh b/tools/cross/mingw/cross-configure.sh index 869ec4851..5a5b69baf 100755 --- a/tools/cross/mingw/cross-configure.sh +++ b/tools/cross/mingw/cross-configure.sh @@ -16,6 +16,7 @@ export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig export PATH=$MINGW/usr/bin:$PATH export QCSYSPREFIX=$MINGW_USR ../../configure \ + --enable-silent-rules \ --host=i686-w64-mingw32.static \ --disable-shared \ $*