Merge pull request #1398 from RaiKoHoff/Dev_NewFeatures

Notepad3 DLL version fixes
2026-06-14 21:09:05 +08:00 · 2019-07-07 13:56:43 +02:00 · 2019-07-07 13:56:43 +02:00 · b030393f12
commit b030393f12
parent 1d2fbc1642 8d8cb2d88f
6 changed files with 108 additions and 62 deletions
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@ -40,21 +40,21 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab
 set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
 set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe

-set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
-set NP3_DOC_DIR=%SCRIPT_DIR%..\doc
-::set NP3_THEMES_DIR=%SCRIPT_DIR%..\themes
-set NP3_BUILD_SCHEMES_DIR=%SCRIPT_DIR%..\Build\themes
-::set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141
-::set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v141
-set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v142
-set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v142
+call :RESOLVEPATH NP3_DISTRIB_DIR %SCRIPT_DIR%..\Build
+call :RESOLVEPATH NP3_DOC_DIR %SCRIPT_DIR%..\doc
+::call :RESOLVEPATH NP3_THEMES_DIR %SCRIPT_DIR%..\themes
+call :RESOLVEPATH NP3_BUILD_SCHEMES_DIR %SCRIPT_DIR%..\Build\themes
+::call :RESOLVEPATH NP3_WIN32_DIR %SCRIPT_DIR%..\Bin\Release_x86_v141
+::call :RESOLVEPATH NP3_X64_DIR %SCRIPT_DIR%..\Bin\Release_x64_v141
+call :RESOLVEPATH NP3_WIN32_DIR %SCRIPT_DIR%..\Bin\Release_x86_v142
+call :RESOLVEPATH NP3_X64_DIR %SCRIPT_DIR%..\Bin\Release_x64_v142

-set NP3_PORTAPP_DIR=%SCRIPT_DIR%Notepad3Portable
-set NP3_PORTAPP_INFO=%NP3_PORTAPP_DIR%\App\AppInfo\appinfo
-set NP3_PORTAPP_INSTALL=%NP3_PORTAPP_DIR%\App\AppInfo\installer
+call :RESOLVEPATH NP3_PORTAPP_DIR %SCRIPT_DIR%Notepad3Portable
+call :RESOLVEPATH NP3_PORTAPP_INFO %NP3_PORTAPP_DIR%\App\AppInfo\appinfo
+call :RESOLVEPATH NP3_PORTAPP_INSTALL %NP3_PORTAPP_DIR%\App\AppInfo\installer

-set NP3_BUILD_VER=%SCRIPT_DIR%..\Versions\build.txt
-set NP3_BUILD_NAME=%SCRIPT_DIR%_buildname.txt
+call :RESOLVEPATH NP3_BUILD_VER %SCRIPT_DIR%..\Versions\build.txt
+call :RESOLVEPATH NP3_BUILD_NAME %SCRIPT_DIR%_buildname.txt

 :: --------------------------------------------------------------------------------------------------------------------

@ -103,6 +103,11 @@ copy /B "%NP3_WIN32_DIR%\lng\np3lng.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\
 copy /B "%NP3_WIN32_DIR%\lng\mplng.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\" /Y /V

 copy /B "%NP3_WIN32_DIR%\Notepad3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+if exist %NP3_WIN32_DIR%\Scintilla.dll (
+    copy /B "%NP3_WIN32_DIR%\Scintilla.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+) else (
+    echo. Scintilla.dll does not exist
+)
 copy /B "%NP3_WIN32_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
 ::copy /B "%NP3_WIN32_DIR%\np3encrypt.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
 ::copy /B "%NP3_WIN32_DIR%\ced.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
@ -125,6 +130,11 @@ copy /B "%NP3_X64_DIR%\lng\np3lng.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\ln
 copy /B "%NP3_X64_DIR%\lng\mplng.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\" /Y /V

 copy /B "%NP3_X64_DIR%\Notepad3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
+if exist %NP3_X64_DIR%\Scintilla.dll (
+    copy /B "%NP3_X64_DIR%\Scintilla.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
+) else (
+    echo. Scintilla.dll does not exist
+)
 copy /B "%NP3_X64_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 ::copy /B "%NP3_X64_DIR%\np3encrypt.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 ::copy /B "%NP3_X64_DIR%\ced.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
@ -164,55 +174,64 @@ del /F "%NP3_PORTAPP_INFO%_tmp.ini"
 goto :END
 :: REPLACE  strg(%1)  srcfile(%2)  replstrg(%3)  dstfile(%4) 
 :REPLACE
-if exist "%~4" del /F /Q "%~4"
-type NUL > "%~4"
-for /f "tokens=1,* delims=¶" %%A in (%~2) do (
-    set string=%%A
-    setlocal EnableDelayedExpansion
-    set modified=!string:%~1=%~3!
-    >> "%~4" echo(!modified!
-    endlocal
-)
-goto:EOF
+    if exist "%~4" del /F /Q "%~4"
+    type NUL > "%~4"
+    for /f "tokens=1,* delims=¶" %%A in (%~2) do (
+        set string=%%A
+        setlocal EnableDelayedExpansion
+        set modified=!string:%~1=%~3!
+        >> "%~4" echo(!modified!
+        endlocal
+    )
+    goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------

 :GETDATE
-for /f "tokens=2 delims==" %%a in ('
-    wmic OS Get localdatetime /value
-') do set "dt=%%a"
-set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%"
-set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%"
-::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%"
-::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%"
-::echo datestamp: "%datestamp%"
-::echo timestamp: "%timestamp%"
-::echo fullstamp: "%fullstamp%"
-goto:EOF
+    for /f "tokens=2 delims==" %%a in ('
+        wmic OS Get localdatetime /value
+    ') do set "dt=%%a"
+    set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%"
+    set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%"
+    ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%"
+    ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%"
+    ::echo datestamp: "%datestamp%"
+    ::echo timestamp: "%timestamp%"
+    ::echo fullstamp: "%fullstamp%"
+    goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------

 :GETFILEVER
-set "file=%~1"
-if not defined file goto:EOF
-if not exist "%file%" goto:EOF
-set "FILEVER="
-for /F "tokens=2 delims==" %%a in ('
-    wmic datafile where name^="%file:\=\\%" Get Version /value 
-') do set "FILEVER=%%a"
-::echo %file% = %FILEVER% 
-goto:EOF
+    set "file=%~1"
+    if not defined file goto:EOF
+    if not exist "%file%" goto:EOF
+    set "FILEVER="
+    for /F "tokens=2 delims==" %%a in ('
+        wmic datafile where name^="%file:\=\\%" Get Version /value 
+    ') do set "FILEVER=%%a"
+    ::echo %file% = %FILEVER% 
+    goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------

 :GETBUILD
-set /p nxbuild=<%NP3_BUILD_VER%
-set /a BUILD = %nxbuild% - 1
-set /p DEVNAME=<%NP3_BUILD_NAME%
-set DEVNAME=%DEVNAME:"=%
-goto:EOF
+    set /p nxbuild=<%NP3_BUILD_VER%
+    set /a BUILD = %nxbuild% - 1
+    set /p DEVNAME=<%NP3_BUILD_NAME%
+    set DEVNAME=%DEVNAME:"=%
+    goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------

+rem Resolve path to absolute.
+rem Param 1: Name of output variable.
+rem Param 2: Path to resolve.
+rem Return: Resolved absolute path.
+:RESOLVEPATH
+    set %1=%~dpfn2
+    goto:EOF
+:: --------------------------------------------------------------------------------------------------------------------
+    
 :: ====================================================================================================================
 :END
-::pause
-endlocal
+pause
+::endlocal
 ::exit
 :: ====================================================================================================================
--- a/scintilla/ScintillaDLL.vcxproj
+++ b/scintilla/ScintillaDLL.vcxproj
@ -245,8 +245,8 @@
    <ClCompile Include="..\oniguruma\src\unicode_unfold_key.c" />
    <ClCompile Include="..\oniguruma\src\utf8.c" />
    <ClCompile Include="..\scioniguruma\OnigurumaRegExEngine.cxx" />
-    <ClCompile Include="..\sciXlexers\LexAHK.cxx" />
    <ClCompile Include="..\sciXlexers\LexAHKL.cxx" />
+    <ClCompile Include="..\sciXlexers\LexTOML.cxx" />
    <ClCompile Include="lexers\LexAsm.cxx" />
    <ClCompile Include="lexers\LexAU3.cxx" />
    <ClCompile Include="lexers\LexAVS.cxx" />
@ -339,6 +339,7 @@
    <ClInclude Include="..\oniguruma\src\regint.h" />
    <ClInclude Include="..\oniguruma\src\regparse.h" />
    <ClInclude Include="..\oniguruma\src\st.h" />
+    <ClInclude Include="..\sciXlexers\CharSetX.h" />
    <ClInclude Include="..\sciXlexers\SciXLexer.h" />
    <ClInclude Include="include\ILexer.h" />
    <ClInclude Include="include\ILoader.h" />
@ -403,6 +404,9 @@
    <ClInclude Include="win32\PlatWin.h" />
    <ClInclude Include="win32\ScintillaWin.h" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="win32\ScintRes.rc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/scintilla/ScintillaDLL.vcxproj.filters
+++ b/scintilla/ScintillaDLL.vcxproj.filters
@ -267,9 +267,6 @@
    <ClCompile Include="lexers\LexRust.cxx">
      <Filter>lexers</Filter>
    </ClCompile>
-    <ClCompile Include="..\sciXlexers\LexAHK.cxx">
-      <Filter>sciXlexers</Filter>
-    </ClCompile>
    <ClCompile Include="..\sciXlexers\LexAHKL.cxx">
      <Filter>sciXlexers</Filter>
    </ClCompile>
@ -345,6 +342,9 @@
    <ClCompile Include="..\oniguruma\src\utf8.c">
      <Filter>oniguruma</Filter>
    </ClCompile>
+    <ClCompile Include="..\sciXlexers\LexTOML.cxx">
+      <Filter>sciXlexers</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="include\ILexer.h">
@ -557,5 +557,13 @@
    <ClInclude Include="..\oniguruma\src\st.h">
      <Filter>oniguruma</Filter>
    </ClInclude>
+    <ClInclude Include="..\sciXlexers\CharSetX.h">
+      <Filter>sciXlexers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="win32\ScintRes.rc">
+      <Filter>win32</Filter>
+    </ResourceCompile>
  </ItemGroup>
 </Project>
--- a/scintilla/win32/ScintRes.rc
+++ b/scintilla/win32/ScintRes.rc
@ -25,12 +25,12 @@ BEGIN
 		BLOCK "040904b0"
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
-			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
+			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component vNP3\0"
 			VALUE	"FileVersion",	VERSION_SCINTILLA "\0"
-			VALUE	"InternalName",	"Scintilla\0"
-			VALUE	"LegalCopyright",	"Copyright 1998-2012 by Neil Hodgson\0"
+			VALUE	"InternalName",	"Scintilla vNP3\0"
+			VALUE	"LegalCopyright",	"Copyright 1998-2019 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
-			VALUE	"ProductName",	"Scintilla\0"
+			VALUE	"ProductName",	"Scintilla vNP3\0"
 			VALUE	"ProductVersion",	VERSION_SCINTILLA "\0"
 		END
 	END
--- a/src/Notepad3DLL.vcxproj
+++ b/src/Notepad3DLL.vcxproj
@ -431,6 +431,7 @@
    <ClCompile Include="ChooseFont\ChooseFont.cpp" />
    <ClCompile Include="ChooseFont\FontEnumeration.cpp" />
    <ClCompile Include="ChooseFont\GdiTextRenderer.cpp" />
+    <ClCompile Include="Config\Config.cpp" />
    <ClCompile Include="Dialogs.c" />
    <ClCompile Include="Dlapi.c" />
    <ClCompile Include="Edit.c" />
@ -440,7 +441,6 @@
    <ClCompile Include="MuiLanguage.c" />
    <ClCompile Include="Notepad3.c" />
    <ClCompile Include="Print.cpp" />
-    <ClCompile Include="StyleLexers\styleLexAHK.c" />
    <ClCompile Include="StyleLexers\styleLexAHKL.c" />
    <ClCompile Include="StyleLexers\styleLexASM.c" />
    <ClCompile Include="StyleLexers\styleLexAU3.c" />
@ -481,6 +481,7 @@
    <ClCompile Include="StyleLexers\styleLexSQL.c" />
    <ClCompile Include="StyleLexers\styleLexStandard.c" />
    <ClCompile Include="StyleLexers\styleLexTCL.c" />
+    <ClCompile Include="StyleLexers\styleLexTOML.c" />
    <ClCompile Include="StyleLexers\styleLexVB.c" />
    <ClCompile Include="StyleLexers\styleLexVBS.c" />
    <ClCompile Include="StyleLexers\styleLexVHDL.c" />
@ -533,6 +534,8 @@
    <ClInclude Include="ChooseFont\ChooseFont.h" />
    <ClInclude Include="ChooseFont\FontEnumeration.h" />
    <ClInclude Include="ChooseFont\GdiTextRenderer.h" />
+    <ClInclude Include="Config\Config.h" />
+    <ClInclude Include="Config\SimpleIni.h" />
    <ClInclude Include="Dialogs.h" />
    <ClInclude Include="Dlapi.h" />
    <ClInclude Include="Edit.h" />
--- a/src/Notepad3DLL.vcxproj.filters
+++ b/src/Notepad3DLL.vcxproj.filters
@ -40,6 +40,9 @@
    <Filter Include="Config">
      <UniqueIdentifier>{80bb23ba-0110-42e2-b201-04e2f8cedbbf}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Source Files\Config">
+      <UniqueIdentifier>{be247306-f241-4f33-8cbc-818664e43d26}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="Dialogs.c">
@ -90,9 +93,6 @@
    <ClCompile Include="ChooseFont\GdiTextRenderer.cpp">
      <Filter>Source Files\ChooseFont</Filter>
    </ClCompile>
-    <ClCompile Include="StyleLexers\styleLexAHK.c">
-      <Filter>Source Files\StyleLexers</Filter>
-    </ClCompile>
    <ClCompile Include="StyleLexers\styleLexASM.c">
      <Filter>Source Files\StyleLexers</Filter>
    </ClCompile>
@ -396,6 +396,12 @@
    <ClCompile Include="..\uchardet\uchardet\src\nsGB18030Prober.cpp">
      <Filter>Source Files\uchardet</Filter>
    </ClCompile>
+    <ClCompile Include="StyleLexers\styleLexTOML.c">
+      <Filter>Source Files\StyleLexers</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\Config.cpp">
+      <Filter>Source Files\Config</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="Dialogs.h">
@ -560,6 +566,12 @@
    <ClInclude Include="..\uchardet\uchardet\src\nsGB18030Prober.h">
      <Filter>Source Files\uchardet</Filter>
    </ClInclude>
+    <ClInclude Include="Config\Config.h">
+      <Filter>Source Files\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\SimpleIni.h">
+      <Filter>Source Files\Config</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\res\Copy.cur">