#101 - extended packaging

adamyg · Feb 20, 2025 · 4b3e6b1 · 4b3e6b1
1 parent 1f46c5e
commit 4b3e6b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -104,7 +104,6 @@ jobs:
         path: mcwin32/bin.${{ matrix.config.toolversion }}/release/*
 
     - name: Installer
-      if: startsWith(matrix.config.name, 'Windows Latest MSVC') || startsWith(matrix.config.name, 'Windows Latest OWC')
       shell: cmd
       run: |
         @set PERL=c:/Strawberry/perl/bin/perl
@@ -114,7 +113,6 @@ jobs:
         "%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')
       uses: softprops/action-gh-release@v1
       with:
         files: ./mcwin32/releases/mcwin32-build*-setup.exe

diff --git a/mcwin32/ChangeLog.txt b/mcwin32/ChangeLog.txt
@@ -1,13 +1,13 @@
-Wed Feb 19 17:46:57 2025 adamy
+Thu Feb 20 12:11:28 2025 adamy
 
 	* build-231
 
 	* 4.8.33 merge (#94)
 
-	* internal tools, externalized (#78)
+	* internal tools front-ends, externalized (#78)
 
 		o mcedit
-		o mddiff
+		o mcdiff and mcbsddiff (diff backend)
 		o mcview
 
 	* upgrades/bugfixes
@@ -17,8 +17,8 @@ Wed Feb 19 17:46:57 2025 adamy
 		o zlib-1.3.1 (#102)
 		o mbedtls-3.6.2 (#100)
 		o libssh2-1.11.1 (#95)
-		o enhanced utf8 support, directory plus username (#97)
-		o EXDEV on rename failure (#85)
+		o enhanced utf8 support, directory plus username; non-ascii user name support (#97)
+		o EXDEV, cross-device link on rename failure; allowing alt move logic (#85)
 		o x64 installer path (#79)
 
 Wed Mar 20 20:30:50 2024 adamy

diff --git a/mcwin32/libpcre2/.gitignore b/mcwin32/libpcre2/.gitignore
@@ -1,6 +1,7 @@
+*10.42*
 pcre2-*/
 .unpacked.*
 Makefile
-Makefile.in.*
 *.err
 
+
diff --git a/mcwin32/src/win32_utl.c b/mcwin32/src/win32_utl.c
@@ -230,7 +230,7 @@ ugetenv(const char *varname)
             char *utf8env;
 
             if (NULL != (utf8env = calloc(utf8sz + 1 /*NUL*/, sizeof(char)))) {
-                (void) WideCharToMultiByte(CP_UTF8, 0, wenv, (int)wenv, utf8env, utf8sz, NULL, NULL);
+                (void) WideCharToMultiByte(CP_UTF8, 0, wenv, (int)wenvsz, utf8env, utf8sz, NULL, NULL);
                 utf8env[utf8sz] = 0;
 
                 // when values differ, return utf8
@@ -393,14 +393,15 @@ mc_TMPDIR(void)
         char sysdir[MAX_PATH] = {0};
         const char *tmpdir;
 
-        // determine accessible temp directory
+        // explicit
         tmpdir = ugetenv("MC_TMPDIR");          // 4.8.27
+
+        // accessible temp directory
         if (!tmpdir) tmpdir = ugetdir("TMP");
         if (!tmpdir) tmpdir = ugetdir("TEMP");
         if (!tmpdir) tmpdir = ugetdir("TMPDIR");
 
         if (!tmpdir) {
-            const char *tmpdir;
             if (NULL != (tmpdir = ugetenv("USERPROFILE"))) {
                 //
                 //  "%USERPROFILE%\AppData\Local\Temp": see #97