#5 - ci-upgrades

Author: adamyg

libtool_win32.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # -*- mode: perl; -*-
-# $Id: libtool_win32.pl,v 1.10 2023/12/26 17:01:00 cvsuser Exp $
+# $Id: libtool_win32.pl,v 1.11 2025/02/01 19:57:27 cvsuser Exp $
 # libtool emulation for WIN32 builds.
 #
 #   **Warning**
@@ -18,7 +18,7 @@
 #       $(D_LIB)/%.lo:      %.cpp
 #               $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -o $(D_OBJ)/$@ -c $<
 #
-# Copyright Adam Young 2012 - 2023
+# Copyright Adam Young 2012 - 2025
 # All rights reserved.
 #
 # This file is part of the Midnight Commander.
@@ -362,8 +362,8 @@
     my $cl_ltcg = 0;
     my $cl_debug = undef;
     my $cl_runtime = 'MT';
+    my $targetarch = '';
     my $gcc_debugger = 0;
-    my $x64 = 0;
     my @OBJECTS;
     my @RESOURCES;
     my @EXPORTS;
@@ -374,9 +374,9 @@
     my @STUFF;
 
     $cc = 'gcc' if ('g++' eq $cc);              # alises
-    if ('cl' eq $cc) {
-        if (defined $ENV{'LIB'}) {              # x64 toolchain selection (TODO: option)
-            $x64 = 1 if ($ENV{'LIB'} =~ /amd64/);
+    if ($cc eq 'cl') {
+        if (defined $ENV{'VSCMD_ARG_TGT_ARCH'} && $ENV{'VSCMD_ARG_TGT_ARCH'} eq "x64") {
+            $targetarch = 'x64';
         }
     }
 
@@ -773,7 +773,7 @@
         }
 
     MSVCRuntimeX64($cl_runtime, \@LIBRARIES)
-        if ($x64 && $cl_runtime);
+        if ($targetarch eq 'x64' && $cl_runtime);
 
     Verbose "libraries:";
         foreach(@LIBRARIES) { Verbose "\t$_"; }
@@ -869,35 +869,31 @@
         #
         if (defined $ENV{'VCToolsInstallDir'}) { # 2010 plus
             my $toolbase = $ENV{'VCToolsInstallDir'};
-            if ($x64) {
-                Error("link: x64 linker needed");
-            } else {
-                $cmd = "\"${toolbase}\\bin\\Hostx86\\x86\\link\" @STUFF \@$cmdfile";
-            }
+            my $toolarch = "Hostx86\\x86";
+
+            $toolarch = "Hostx64\\x64"          # x86 or x64
+                if ($targetarch eq 'x64');
+
+            $cmd = "\"${toolbase}\\bin\\${toolarch}\\link\" \@$cmdfile";
 
         } elsif (defined $ENV{'VCINSTALLDIR'}) { # 2008
             my $toolbase = $ENV{'VCINSTALLDIR'};
-            if ($x64) {
-                $cmd = "\"${toolbase}\\bin\\amd64\\link\" @STUFF \@$cmdfile";
-            } else {
-                $cmd = "\"${toolbase}\\bin\\link\" @STUFF \@$cmdfile";
-            }
+            $cmd = "\"${toolbase}\\bin\\link\" \@$cmdfile";
 
-        } else {                                 # default
-            if ($x64) {
-                Error("link: x64 linker needed");
-            } else {
-                $cmd = "link @STUFF \@$cmdfile";
-            }
+        } else {                                # default
+            $cmd = "link \@$cmdfile";
         }
 
         open(CMD, ">${cmdfile}") or
             die "cannot create <${$cmdfile}>: $!\n";
 
+        print CMD "/MACHINE:${targetarch}\n"
+            if ($targetarch);                   # ARM|ARM64|ARM64X|EBC|X64|X86
+
         if ($linktype eq 'dll') {
             print CMD "/DLL\n";
             print CMD "/SUBSYSTEM:WINDOWS\n";
-            if ($x64) {                         # cdecl
+            if ($targetarch eq 'x64') {         # cdecl
               print CMD "/ENTRY:_DllMainCRTStartup"."\n";
             } else {                            # STDCALL
               print CMD "/ENTRY:_DllMainCRTStartup\@12"."\n";
@@ -908,9 +904,6 @@
             print CMD "/SUBSYSTEM:CONSOLE\n";
             print CMD "/OUT:${output}\n";
         }
-
-        print CMD "/MACHINE:X64\n"
-            if ($x64);
         print CMD "/MANIFEST\n";
         print CMD "/NXCOMPAT\n";
         print CMD "/DYNAMICBASE\n";
@@ -929,7 +922,7 @@
         print CMD "/LTCG\n"
             if ($cl_ltcg);
         print CMD "/IGNORE:4197\n"              # FIXME: warning LNK4197: export 'XXXe' specified multiple times; using first specification
-            if ($x64);
+            if ($targetarch eq 'x64');
 
       foreach(@OBJECTS) {
         print CMD true_object($_)."\n";
@@ -1130,6 +1123,7 @@
         print LA "dll=${dllpath}\n";
         print LA "pdb=${pdbpath}\n" if ($pdbpath);
         print LA "manifest=${manifestpath}\n" if ($manifestpath);
+        print LA "targetarch=${targetarch}\n" if ($targetarch);
         print LA "[objects]\n";
         foreach(@OBJECTS) {
             print LA true_object($_)."\n";

makeconfig.pm

@@ -1,10 +1,10 @@
-# $Id: makeconfig.pm,v 1.3 2023/12/26 17:01:00 cvsuser Exp $
+# $Id: makeconfig.pm,v 1.4 2025/02/01 19:57:27 cvsuser Exp $
 # Makefile generation under Win32.
 # -*- perl; tabs: 8; indent-width: 4; -*-
 # Automake emulation for non-unix environments.
 #
 #
-# Copyright (c) 2020 - 2022, Adam Young.
+# Copyright (c) 2020 - 2025, Adam Young.
 # All rights reserved.
 #
 # This file is part of the WinRSH/WinSSH project.
@@ -59,6 +59,7 @@ our $CONFIG_FILE    = 'w32config.h';
 our $TOOLCHAIN      = undef;
 
 our @MAKEFILES      = ();                       # local makefiles; build order
+our @CONTRIBEXTRA   = ();
 
 our @LIBRARIES      = ();                       # local libraries -l<xxx> lib<xxx>.lib
 our @LIBRARIES2     = ();                       # local libraries -l<xxx> xxx.lib
@@ -321,6 +322,7 @@ sub __ExportConfigurations
     $self->{LIBRARIES2}     = \@LIBRARIES2;
     $self->{TESTLIBRARIES}  = \@TESTLIBRARIES;
     $self->{OPTLIBRARIES}   = \@OPTLIBRARIES;
+    $self->{CONTRIBEXTRA}   = \@CONTRIBEXTRA;
 
     $$x_tokens{PACKAGE_VERSION} = $PACKAGE_VERSION;
     $$x_tokens{PACKAGE_STRING} = $PACKAGE_NAME . ' ' . $PACKAGE_VERSION;

makelib.in

@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: makelib.in,v 1.12 2023/12/26 17:01:00 cvsuser Exp $
+# $Id: makelib.in,v 1.13 2025/02/01 19:57:27 cvsuser Exp $
 # -*- mode: perl; tabs: 8; indent-width: 4; -*-
 # makelib configuration
 #
@@ -34,7 +34,7 @@
 
 $PACKAGE	= 'winsh';
 $PACKAGE_NAME	= 'WinSSH/WinRSH';
-$PACKAGE_VERSION = '0.3.0';
+$PACKAGE_VERSION = '0.3.1';
 
 $PACKAGE_URL	= 'https://github.com/adamyg/winxsh';