Fix build and release workflow issues

Author: Merrick Zhang

.github/workflows/build-and-release.yml

@@ -41,29 +41,22 @@ jobs:
 
     - name: Copy built files
       run: |
-        # Try different possible output directories
-        $possibleDirs = @(
-          "build/bin/${{ matrix.configuration }}/${{ matrix.platform }}",
-          "bin/${{ matrix.configuration }}/${{ matrix.platform }}",
-          "build/VisualStudio/${{ matrix.configuration }}/${{ matrix.platform }}",
-          "${{ matrix.configuration }}/${{ matrix.platform }}"
-        )
+        # Use the exact output directory we specified in msbuild
+        $srcDir = "build/bin/${{ matrix.configuration }}/${{ matrix.platform }}"
+        $destDir = "output/${{ matrix.platform }}"
         
-        $srcDir = $null
-        foreach ($dir in $possibleDirs) {
-          if (Test-Path "$dir\Notepad4.exe") {
-            $srcDir = $dir
-            break
-          }
-        }
-        
-        if ($srcDir) {
+        if (Test-Path "$srcDir\Notepad4.exe") {
           Write-Host "Found Notepad4.exe in: $srcDir"
-          $destDir = "output/${{ matrix.platform }}"
           Copy-Item -Path "$srcDir\Notepad4.exe" -Destination "$destDir"
           Copy-Item -Path "$srcDir\matepath.exe" -Destination "$destDir"
+          # Also copy locale folder if it exists
+          if (Test-Path "$srcDir\locale") {
+            Copy-Item -Path "$srcDir\locale" -Destination "$destDir" -Recurse
+          }
         } else {
-          Write-Error "Could not find Notepad4.exe in any of the possible directories"
+          Write-Error "Could not find Notepad4.exe in $srcDir"
+          # List directory structure for debugging
+          Get-ChildItem -Path "." -Recurse -File | Where-Object { $_.Name -match "\.exe$" } | Select-Object FullName
           exit 1
         }
 

build/Notepad4.nsi

@@ -57,59 +57,18 @@ Section "Notepad4 Main Program" SEC_MAIN
 SectionEnd
 
 Section "Language Packs" SEC_LOCALE
-  ; Build locale path using ARCH variable
-  ; Actual locale path: build\bin\Release\{platform}\locale\
+  ; Use locale directory from SOURCE_DIR (already copied by previous step)
+  ; SOURCE_DIR points to output/{platform} which contains locale subdirectory
 
-  ; Set base directory for locales
-  !define LOCALE_BASE_DIR "..\build\bin\Release"
+  ; Check if locale directory exists
+  IfFileExists "${SOURCE_DIR}\locale" +2 0
+  Goto end_locale_section
 
-  ; Determine platform directory based on ARCH variable
-  !ifdef ARCH
-    !if "${ARCH}" == "x86"
-      !define PLATFORM_DIR "Win32"
-    !elseif "${ARCH}" == "x64"
-      !define PLATFORM_DIR "x64"
-    !elseif "${ARCH}" == "arm64"
-      !define PLATFORM_DIR "ARM64"
-    !else
-      !define PLATFORM_DIR "Win32"
-    !endif
-  !else
-    !define PLATFORM_DIR "Win32"
-  !endif
-  
-  ; Build full locale directory path
-  !define LOCALE_FULL_DIR "${LOCALE_BASE_DIR}\${PLATFORM_DIR}\locale"
-  
-  SetOutPath "$INSTDIR\locale\de"
-  File /r "${LOCALE_FULL_DIR}\de\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\fr"
-  File /r "${LOCALE_FULL_DIR}\fr\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\it"
-  File /r "${LOCALE_FULL_DIR}\it\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\ja"
-  File /r "${LOCALE_FULL_DIR}\ja\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\ko"
-  File /r "${LOCALE_FULL_DIR}\ko\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\pl"
-  File /r "${LOCALE_FULL_DIR}\pl\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\pt-BR"
-  File /r "${LOCALE_FULL_DIR}\pt-BR\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\ru"
-  File /r "${LOCALE_FULL_DIR}\ru\*.dll"
-  
-  SetOutPath "$INSTDIR\locale\zh-Hans"
-  File /r "${LOCALE_FULL_DIR}\zh-Hans\*.dll"
+  ; Copy entire locale directory recursively
+  SetOutPath "$INSTDIR"
+  File /r "${SOURCE_DIR}\locale\*"
 
-  SetOutPath "$INSTDIR\locale\zh-Hant"
-  File /r "${LOCALE_FULL_DIR}\zh-Hant\*.dll"
+end_locale_section:
 SectionEnd
 
 ; Component descriptions

build/VisualStudio/Notepad4.vcxproj

@@ -39,19 +39,6 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='AVX2Release' or '$(Configuration)'=='AVX512Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.EndsWith('LLVMRelease'))" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='AVX2Debug' or '$(Configuration)'=='AVX512Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.EndsWith('LLVMDebug'))" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
@@ -75,8 +62,6 @@
   <PropertyGroup>
     <LinkIncremental Condition="$(Configuration.EndsWith('Debug'))">true</LinkIncremental>
     <LinkIncremental Condition="$(Configuration.EndsWith('Release'))">false</LinkIncremental>
-    <OutDir Condition="!$(Configuration.StartsWith('AVX'))">$(SolutionDir)..\bin\$(Configuration)\$(Platform)\</OutDir>
-    <IntDir Condition="!$(Configuration.StartsWith('AVX'))">$(SolutionDir)..\bin\$(Configuration)\$(Platform)\obj\$(ProjectName)\</IntDir>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.EndsWith('Release'))">