build

adamyg · Mar 10, 2024 · e00717e · e00717e
1 parent df604ba
commit e00717e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -109,7 +109,7 @@ jobs:
         choco install innosetup --version=5.6.1 --force
         cd mcwin32
         @rem .\support\gmake-42 release package
-        "%programfiles(x86)%\Inno Setup 5\ISCC" -DBUILD_INFO=1 -DBUILD_TYPE=release -DBUILD_TOOLCHAIN=${{ matrix.config.toolchain }} ".\releases\mc-inno-setup.iss"
+        "%programfiles(x86)%\Inno Setup 5\ISCC" -DBUILD_INFO=1 -DBUILD_TYPE=release ".\releases\mc-inno-setup.iss"
 
     - name: Release artifacts
       if: startsWith(matrix.config.name, 'Windows Latest MSVC') || startsWith(matrix.config.name, 'Windows Latest OWC')

diff --git a/mcwin32/Makefile.in b/mcwin32/Makefile.in
@@ -914,7 +914,7 @@ clean:
 		$(MAKE) -C libz clean
 		$(MAKE) -C libw32 clean
 		$(MAKE) -C diff clean
-		$(MAKE) -C kbtest clean
+		$(MAKE) -C src/kbtest clean
 		$(MAKE) -C autoupdater clean
 		-$(RM) $(MSGOBJS) $(MSGDIRS) $(QUIETOUT)
 		-$(RM) $(CONFIGURATION) $(QUIETOUT)

diff --git a/mcwin32/buildinfo.pl b/mcwin32/buildinfo.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # -*- mode: perl; -*-
-# $Id: buildinfo.pl,v 1.10 2024/01/16 15:18:03 cvsuser Exp $
+# $Id: buildinfo.pl,v 1.11 2024/03/09 17:58:47 cvsuser Exp $
 # buildinfo generation
 #
 # Copyright Adam Young 2018 - 2024
@@ -131,8 +131,13 @@
 #define ${prefix}BUILD_NUMBER "${buildnumber}"
 EOT
 
-	print FILE "#define BUILD_TOOLCHAIN \"${buildtoolchain}\"\n"
-		if ($buildtoolchain);
+	if ($buildtoolchain) {
+		my $buildtoolname = $buildtoolchain;
+		$buildtoolname =~ s/^\.//;
+
+		print FILE "#define BUILD_TOOLCHAIN \"${buildtoolchain}\"\n";
+		print FILE "#define BUILD_TOOLNAME \"${buildtoolname}\"\n";
+	}
 
 	if ($buildtype) {
 		print FILE "#define BUILD_TYPE \"${buildtype}\"\n";

diff --git a/mcwin32/releases/mc-inno-setup.iss b/mcwin32/releases/mc-inno-setup.iss
@@ -52,8 +52,8 @@ DefaultGroupName=Midnight Commander
 LicenseFile=..\{#BinDir}\doc\COPYING
 
 OutputDir=.
-#if defined(BUILD_TOOLCHAIN)
-OutputBaseFilename=mcwin32-build{#BUILD_NUMBER}-{#BUILD_TOOLCHAIN}-setup
+#if defined(BUILD_TOOLNAME)
+OutputBaseFilename=mcwin32-build{#BUILD_NUMBER}-{#BUILD_TOOLNAME}-setup
 #else
 OutputBaseFilename=mcwin32-build{#BUILD_NUMBER}-setup
 #endif