Merge pull request #5636 from RaiKoHoff/Dev_Master

fix: PortableApps Platform build should use PA's grepWinPortable

Author: RaiKoHoff

.gitignore

@@ -57,19 +57,11 @@ Thumbs.db
 /np3portableapp/Signing*.txt
 /np3portableapp/Notepad3Portable*.7z
 /np3portableapp/Notepad3Portable*.exe
-#/np3portableapp/Notepad3Portable/Data
-#/np3portableapp/Notepad3Portable/Data
-#/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
-#/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
-#/np3portableapp/Notepad3Portable/App/DefaultData/settings
-#/np3portableapp/Notepad3Portable/App/Notepad3/Docs
 /np3portableapp/Notepad3Portable*.exe
 /np3portableapp/Notepad3Portable/Notepad3Portable*.exe
 /np3portableapp/Notepad3Portable/App/Notepad3/x64/*.exe
-/np3portableapp/Notepad3Portable/App/Notepad3/x64/grepWin
 /np3portableapp/Notepad3Portable/App/Notepad3/x64/lng
 /np3portableapp/Notepad3Portable/App/Notepad3/x86/*.exe
-/np3portableapp/Notepad3Portable/App/Notepad3/x86/grepWin
 /np3portableapp/Notepad3Portable/App/Notepad3/x86/lng
 #
 

Build/Build_PortableApp.cmd

@@ -5,6 +5,7 @@
 SettingsVersion=5
 ;AnalyzeReliableConfidenceLevel=50
 [Settings2]
+;grepWin.exe=grepWinNP3.exe
 ;IMEInteraction=0
 ;DateTimeFormat=         ;(-> <Locale dependent short format>)
 ;DateTimeLongFormat=     ;(-> <Locale dependent long format>)
@@ -14,7 +15,6 @@ SettingsVersion=5
 ;DefaultExtension=txt
 ;DenyVirtualSpaceAccess=0
 ;filebrowser.exe=minipath.exe
-;grepWin.exe=grepWinNP3.exe
 ;FileCheckInterval=2000  ;(min: 200[msec] - if equal or less, notify immediately)
 ;FileWatchingMethod=0    ;(0=both[default], 1=poll-only, 2=push-only)
 ;FileChangedIndicator=[@]

Build/Notepad3.ini

@@ -0,0 +1,198 @@
+[Notepad3]
+;Notepad3.ini=%USERPROFILE%\Notepad3.ini
+;Notepad3.ini=%APPDATA%\Rizonesoft\Notepad3\Notepad3.ini
+[Settings]
+SettingsVersion=5
+;AnalyzeReliableConfidenceLevel=50
+[Settings2]
+grepWin.exe=%PORTABLEAPPS_DIR%\grepWinPortable\grepWinPortable.exe
+;IMEInteraction=0
+;DateTimeFormat=         ;(-> <Locale dependent short format>)
+;DateTimeLongFormat=     ;(-> <Locale dependent long format>)
+;TimeStampRegEx=         ;(-> \$Date:[^\$]+\$ ) (Find-Pattern to Update Stamps)
+;TimeStampFormat=        ;(-> $Date: %s $) {Print format should fit to TimeStampRegEx}
+;DefaultDirectory=
+;DefaultExtension=txt
+;DenyVirtualSpaceAccess=0
+;filebrowser.exe=minipath.exe
+;FileCheckInterval=2000  ;(min: 200[msec] - if equal or less, notify immediately)
+;FileWatchingMethod=0    ;(0=both[default], 1=poll-only, 2=push-only)
+;FileChangedIndicator=[@]
+;FileDeletedIndicator=[X]
+;FileDlgFilters=
+;FileLoadWarningMB=4
+;MultiFileArg=0
+;NoCGIGuess=0
+;NoCopyLineOnEmptySelection=0
+;NoCutLineOnEmptySelection=0
+;CopyMultiSelectionSeparator=   ;(-> <use current EOL>)  {use empty value for no separator}
+;NoFadeHidden=0
+;NoFileVariables=0
+;NoHTMLGuess=0
+;PortableMyDocs=1
+;OpacityLevel=75
+;FindReplaceOpacityLevel=50
+;RelativeFileMRU=1
+;ReuseWindow=0
+;SaveBlankNewFile=true
+;SciFontQuality=3
+;SimpleIndentGuides=0
+;SingleFileInstance=1
+;ShellAppUserModelID=Rizonesoft.Notepad3
+;ShellUseSystemMRU=1
+;StickyWindowPosition=0
+;SubWrappedLineSelectOnMarginClick=false
+;LaunchInstanceWndPosOffset=28
+;LaunchInstanceFullVisible=true
+;UseOldStyleBraceMatching=0
+;WebTemplate1=https://google.com/search?q=%s
+;WebTmpl1MenuName=Open Web Action 1
+;WebTemplate2=https://en.wikipedia.org/w/index.php?search=%s
+;WebTmpl2MenuName=Open Web Action 2
+;ExtendedWhiteSpaceChars=
+;AutoCompleteWordCharSet=
+;AutoCompleteFillUpChars=
+;LineCommentPostfixStrg=
+;UpdateDelayMarkAllOccurrences=50
+;CurrentLineHorizontalSlop=40
+;CurrentLineVerticalSlop=5
+;UndoTransactionTimeout=0  ;in [msec]
+;AdministrationTool.exe=
+;DevDebugMode=0
+;LocaleAnsiCodePageAnalysisBonus=33
+;UchardetLanguageFilter=31
+;  Bitmask controlling which CJK charset probers are active in uchardet:
+;    Bit 0 (0x01/1)  = Chinese Simplified (GB18030)
+;    Bit 1 (0x02/2)  = Chinese Traditional (Big5, EUC-TW)
+;    Bit 2 (0x04/4)  = Japanese (Shift_JIS, EUC-JP)
+;    Bit 3 (0x08/8)  = Korean (EUC-KR)
+;    Bit 4 (0x10/16) = Non-CJK (single-byte encodings)
+;  Common values:
+;    31 = All probers (default)
+;    27 = Exclude Japanese (fix GB18030 misdetected as EUC-JP)
+;    17 = Chinese Simplified + Non-CJK only
+;     3 = Chinese only (simplified + traditional)
+;LexerSQLNumberSignAsComment=1
+;AtomicFileSave=true
+;ExitOnESCSkipLevel=2
+;ZoomTooltipTimeout=3200  ;in [msec]
+;WrapAroundTooltipTimeout=2000  ;in [msec]
+;LargeIconScalePrecent=150
+;DarkModeBkgColor=0x1F1F1F
+;DarkModeBtnFaceColor=0x333333
+;DarkModeTxtColor=0xEFEFEF
+;HyperlinkShellExURLWithApp=""
+;HyperlinkShellExURLCmdLnArgs="${URL}"  ;(use ${URL} as place holder for clicked Hyperlink URL string)
+;HyperlinkFileProtocolVerb=""           ;(ShellExecuteEx()::lpVerb (""=default, "edit", "explore", "find", "open", "print", "properties", "runas")
+;CodeFontPrefPrioList="Cascadia Code,Cascadia Mono,Cousine,Fira Code,Source Code Pro,Roboto Mono,DejaVu Sans Mono,Inconsolata,Consolas,Lucida Console"
+;TextFontPrefPrioList="Cascadia Mono,Cousine,Roboto Mono,DejaVu Sans Mono,Inconsolata,Consolas,Lucida Console"
+[Statusbar Settings]
+;VisibleSections=0 1 15 14 2 4 5 6 7 8 9 10 11
+;SectionPrefixes=Ln  ,Col  ,Sel  ,Sb  ,SLn  ,Occ  ,,,,,,,Ch  ,Repl  ,Eval  ,U+,
+;SectionPostfixes=,,,,,,,,,,,,,,,,
+;SectionWidthSpecs=30 20 20 20 20 20 20 0 0 0 0 0 0 0 20 24
+;ZeroBasedColumnIndex=0
+;ZeroBasedCharacterCount=0
+[Toolbar Images]
+;BitmapDefault=<[<drive>:|relative_]\path_to>\Toolbar.bmp
+;BitmapHot=<[<drive>:|relative_]\path_to>\ToolbarHot.bmp
+;BitmapDisabled=<[<drive>:|relative_]\path_to>\ToolbarDisabled.bmp
+[Toolbar Labels]
+;01=New
+;02=Open
+;03=Browse
+;04=Save
+;05=Undo
+;06=Redo
+;07=Cut
+;08=Copy
+;09=Paste
+;10=Find
+;11=Replace
+;12=Word Wrap
+;13=Zoom In
+;14=Zoom Out
+;15=Scheme
+;16=Customize Schemes
+;17=Exit
+;18=Save As
+;19=Save Copy
+;20=Delete
+;21=Print
+;22=Favorites
+;23=Add to Favorites
+;24=Toggle Folds
+;25=Execute Document
+;26=Focused View
+;27=Monitoring Log
+;28=History
+;29=Always On Top
+;30=Search in Files
+;31=Reset Zoom
+;32=New Empty Window
+[Styles]
+[Window]
+;<ResX>x<ResY> DefaultWindowPosition=
+[Suppressed Messages]
+[Custom Colors]
+[Common Base]
+[2nd Common Base]
+[Text Files]
+[ANSI Art]
+[Apache Config Files]
+[Assembly Script]
+[AutoHotkey Script]
+[AutoIt3 Script]
+[AviSynth Script]
+[Awk Script]
+[Batch Files]
+[C# Source Code]
+[C/C++ Source Code]
+[Cmake Script]
+[Coffeescript]
+[Configuration Files]
+[CSS Style Sheets]
+[CSV Prism]
+[D Source Code]
+[Dart Source Code]
+[Diff Files]
+[Fortran Source Code]
+[Go Source Code]
+[Inno Setup Script]
+[Java Source Code]
+[JavaScript]
+[JSON]
+[Julia Script]
+[KiXtart Script]
+[Kotlin Source Code]
+[LaTeX Files]
+[Lua Script]
+[Makefiles]
+[Markdown]
+[MATLAB]
+[Nim Source Code]
+[NSIS Script]
+[Pascal Source Code]
+[Perl Script]
+[PowerShell Script]
+[Python Script]
+[Registry Files]
+[Resource Script]
+[R-S-SPlus Statistics Code]
+[Ruby Script]
+[Rust Source Code]
+[Shell Script]
+[SQL Query]
+[SystemVerilog HDVL]
+[Tcl Script]
+[TOML Config]
+[VBScript]
+[Verilog HDL]
+[VHDL]
+[Visual Basic]
+[Web Source Code]
+[XML Document]
+[YAML]
+[Recent Files]
+[Recent Find]
+[Recent Replace]

Build/Notepad3_pap.ini

@@ -33,11 +33,11 @@ SET TEMP_NAME="make_portable_temp"
 
 IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe"   CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
 IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe"   CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
-IF NOT EXIST "..\%INPUTDIRx86%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x86 first!"
+::IF NOT EXIST "..\%INPUTDIRx86%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x86 first!"
 IF NOT EXIST "..\%INPUTDIRx86%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x86 first!"
 IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe"   CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
 IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe"   CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
-IF NOT EXIST "..\%INPUTDIRx64%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x64 first!"
+::IF NOT EXIST "..\%INPUTDIRx64%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x64 first!"
 IF NOT EXIST "..\%INPUTDIRx64%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
 
 CALL :SubGetVersion
@@ -91,8 +91,8 @@ IF EXIST "%TEMP_NAME%"     RD /S /Q "%TEMP_NAME%"
 IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%"
 IF NOT EXIST "Packages"    MD "Packages"
 
-FOR %%A IN ("..\License.txt" "..\Readme.txt" "..\grepWinNP3\grepWinLicense.txt" "Notepad3.ini" "minipath.ini"^
-    "..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\grepWinNP3.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
+FOR %%A IN ("..\License.txt" "..\Readme.txt" "Notepad3.ini" "minipath.ini"^
+    "..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
 
 SET "LNG=%TEMP_NAME%\lng"
 SET "GRP=%TEMP_NAME%\lng\gwLng\"