Amend 6b763af4c8

The cherry-pick was incorrect and included logic from the main branch. Signed-off-by: Itms <itms@wildfiregames.com>
Bump build date of A27.1 RC2
2025-07-14 14:47:59 +02:00 · 2025-07-12 18:36:33 +02:00 · 2025-07-12 15:19:15 +02:00 · 2025-07-12 15:18:21 +02:00 · 2025-07-12 15:17:22 +02:00 · 2025-07-12 15:14:45 +02:00
7 changed files with 23 additions and 9 deletions
@@ -9,6 +9,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
      - name: Install lxml
        run: pip3 install lxml
      - name: Workaround for authentication problem with LFS
@@ -9,6 +9,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
      - id: restore-pip-cache
        uses: actions/cache/restore@v4
        with:
@@ -1,9 +1,14 @@
 local m = {}
-m._VERSION = "1.2.0-dev"
+m._VERSION = "1.3.0-dev"

 m.additional_pc_path = nil
 m.static_link_libs = false

+local pkg_config_command = "pkg-config"
+if os.getenv("PKG_CONFIG") then
+	pkg_config_command = os.getenv("PKG_CONFIG")
+end
+
 local function os_capture(cmd)
 	return io.popen(cmd, 'r'):read('*a'):gsub("\n", " ")
 end
@@ -12,7 +17,7 @@ local function parse_pkg_config_includes(lib, alternative_cmd, alternative_flags
 	local result
 	if not alternative_cmd then
 		local pc_path = m.additional_pc_path and "PKG_CONFIG_PATH="..m.additional_pc_path or ""
-		result = os_capture(pc_path.." pkg-config --cflags "..lib)
+		result = os_capture(pc_path .. " " .. pkg_config_command .. " --cflags " .. lib)
 	else
 		if not alternative_flags then
 			result = os_capture(alternative_cmd.." --cflags")
@@ -81,7 +86,7 @@ function m.add_links(lib, alternative_cmd, alternative_flags)
 	if not alternative_cmd then
 		local pc_path = m.additional_pc_path and "PKG_CONFIG_PATH="..m.additional_pc_path or ""
 		local static = m.static_link_libs and " --static " or ""
-		result = os_capture(pc_path.." pkg-config --libs "..static..lib)
+		result = os_capture(pc_path .. " " .. pkg_config_command .. " --libs " .. static .. lib)
 	else
 		if not alternative_flags then
 			result = os_capture(alternative_cmd.." --libs")
@@ -40,7 +40,7 @@
  <url type="translate">https://gitea.wildfiregames.com/0ad/0ad/wiki/Localization</url>
  <url type="donation">https://play0ad.com/community/donate/</url>
  <releases>
-    <release version="0.27.1" date="2025-06-20">
+    <release version="0.27.1" date="2025-07-13">
        <url type="details">https://play0ad.com/patch-release-27-1-for-0-a-d/</url>
        <description>
            <p>Wildfire Games proudly announces the first "patch release" of 0 A.D., 0.27.1 for Alpha 27: "Agni".</p>
@@ -42,8 +42,6 @@ fi

 echo

-# If we're in bash then make HOSTTYPE available to Premake, for primitive arch-detection
-export HOSTTYPE="$HOSTTYPE"
 # Now run Premake to create the makefiles
 echo "Premake args: ${premake_args}"
 if [ "$OS" != "Darwin" ]; then
@@ -7,6 +7,13 @@ set "svnrev=28256"
 svn co https://svn.wildfiregames.com/public/windows-libs/trunk@%svnrev% win32 || ^
 svn export --force https://svn.wildfiregames.com/public/windows-libs/trunk@%svnrev% win32

+rem **Fixup SpiderMonkey for Windows 7 on Win32**
+rem This change is performed separately to allow backporting to A27
+set "smrev=28263"
+svn up -r %smrev% win32/spidermonkey/bin || ^
+svn export --force https://svn.wildfiregames.com/public/windows-libs/trunk/spidermonkey/bin@%smrev% win32/spidermonkey/bin || ^
+exit /b 1
+
 rem **Copy dependencies' binaries to binaries/system/**

 set DIR_LIST=boost enet fcollada fmt freetype gloox iconv icu libcurl libpng libsodium libxml2 microsoft miniupnpc nvtt openal sdl2 spidermonkey vorbis wxwidgets zlib
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -20,6 +20,6 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-#define PYROGENESIS_VERSION "0.27.0"
-#define PYROGENESIS_VERSION_WORD 0,27,0,0
+#define PYROGENESIS_VERSION "0.27.1"
+#define PYROGENESIS_VERSION_WORD 0,27,1,0
 extern wchar_t build_version[];
Author	SHA1	Message	Date
Itms	6a576daa4b	Amend `6b763af4c8` The cherry-pick was incorrect and included logic from the main branch. Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-14 14:47:59 +02:00
Itms	69461c90b7	Bump build date of A27.1 RC2 (cherry picked from commit `16bcc5a870`) Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-12 18:36:33 +02:00
Itms	6b763af4c8	Fixup SpiderMonkey DLL for Windows 7 on Win32 Pulling the DLL from SVN is performed separately to allow backporting to A27. Accepted-By: sera Reviewed-On: https://gitea.wildfiregames.com/0ad/0ad/pulls/8175 (cherry picked from commit `b362f0537a`) Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-12 15:19:15 +02:00
Ralph Sennhauser	0dbc1f604a	Add support for specifying pkg-config via env For cross compiling there is a need to specify an alternative binary for pkg-config. It's customary to use the environment variable PKG_CONFIG for this. Ref: #8135 Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> (cherry picked from commit `2b5830e82a`) Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-12 15:18:21 +02:00
Ralph Sennhauser	bf4eee555f	Don't export HOSTTYPE in update-workspace.sh Exporting HOSTTYPE prevents cross compilation as HOSTTYPE is used to override target host arch instead of detecting it from chosen compiler. This then results in the wrong arch specific source files to be included. So just don't set it by default and let it to the user to set it if he so chooses. Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> (cherry picked from commit `707abee34d`) Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-12 15:17:22 +02:00
Itms	dae7a8c394	Bump engine version to 0.27.1	2025-07-12 15:14:45 +02:00
Itms	4633a2d522	Extend previous commit Backport part of `0e1c881fef` Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-12 15:14:34 +02:00
Dunedan	aa3767d2f9	Fix pre-commit workflow to work with Ubuntu 24.04 (cherry picked from commit `782bab293b`) Signed-off-by: Itms <itms@wildfiregames.com>	2025-07-08 11:16:31 +02:00