Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARM64 Build #2

Merged
merged 166 commits into from Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
ffc4f20
+ cln: code cleanup
RaiKoHoff Jun 22, 2020
4d6e2da
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jun 23, 2020
fc640bd
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jun 24, 2020
6baae00
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jun 25, 2020
e81e4af
ARM64: build most components except grepWinNP3
imbushuo Jun 26, 2020
111f866
ARM64: use vcpkg to provide boost libraries for grepWinNP3
imbushuo Jun 26, 2020
98bc24a
MUI - Add some translation in grepWinNP3 for it-IT
hpwamr Jun 26, 2020
a3a898d
+ upd: Version files and Changes.txt
hpwamr Jun 26, 2020
696d04d
Merge pull request #2463 from hpwamr/mui
hpwamr Jun 26, 2020
0c2ff76
Fix typo in ZoomTooltipTimeout config option
hugepants Jun 26, 2020
f02ef50
Merge pull request #2465 from hugepants/patch-1
hpwamr Jun 27, 2020
8cdae0f
Merge remote-tracking branch 'notepad3_orig_rizone/master' into grepW…
RaiKoHoff Jun 28, 2020
c87a7ce
MUI - Synchronize files header with "original grepWin_2.0.2"
hpwamr Jun 28, 2020
fc029cf
Merge pull request #2466 from hpwamr/mui
hpwamr Jun 28, 2020
b18ffed
Merge remote-tracking branch 'notepad3_orig_rizone/master' into grepW…
RaiKoHoff Jun 28, 2020
a5ef3bb
+ chg: silent ignore write permissions missing on Inifile
RaiKoHoff Jun 28, 2020
4acf297
+ rev: re-enable messages if File-Locking failded
RaiKoHoff Jun 28, 2020
60d7097
be-BY, ru-RU: update grepWinNP3 translation
alexantr Jun 28, 2020
8d88127
Merge pull request #2468 from alexantr/be-ru
hpwamr Jun 28, 2020
ff588d5
MUI - Correction tipo
hpwamr Jun 28, 2020
ead32f0
Merge pull request #2469 from hpwamr/mui
hpwamr Jun 28, 2020
075c7b8
Fix Dutch translation of 'Untitled'
jveldhuizen Jun 29, 2020
11c49c8
Merge pull request #2470 from jveldhuizen/patch-1
hpwamr Jun 29, 2020
72eaa11
grepWinNP3 JP: Modification of about dialog
maboroshin Jun 29, 2020
392c489
MUI - Synchro the "Strings Order" of All .lang files with "original …
hpwamr Jun 29, 2020
daa65bc
Merge pull request #2472 from hpwamr/mui
hpwamr Jun 29, 2020
d3c21b3
Merge branch 'master' into master
hpwamr Jun 30, 2020
104b5c2
Merge pull request #2471 from maboroshin/master
hpwamr Jun 30, 2020
552d2a6
MUI - Translation of "About dialog" for all languages
hpwamr Jun 30, 2020
9542483
Merge pull request #2473 from hpwamr/mui
hpwamr Jun 30, 2020
b1a8f02
grepWinNP3 JP: typo
maboroshin Jun 30, 2020
10c8db3
MUI - some translations for de-De, es-ES, fr-FR and nl-NL
hpwamr Jun 30, 2020
2cca2cd
Merge pull request #2474 from maboroshin/master
hpwamr Jun 30, 2020
680029a
grepWin new Hungarian strings
xsak Jun 30, 2020
a680aa3
grepWin new Hungarian strings
xsak Jun 30, 2020
52fdc79
Merge branch 'master' of github.com:xsak/Notepad3
xsak Jun 30, 2020
bab4021
MUI - Revert to original "searchstring"
hpwamr Jun 30, 2020
9578104
MUI - Add language file for es-MX (Spanish Mexican (Mexico))
hpwamr Jun 30, 2020
834a0e0
MUI- minor corrections (remove extra blank space)
hpwamr Jun 30, 2020
0dfec44
Merge pull request #2476 from xsak/master
hpwamr Jun 30, 2020
602e891
Merge pull request #2477 from hpwamr/mui
hpwamr Jun 30, 2020
a31ad1d
+ chg: Minor changes: Trip Trailing Blanks
hpwamr Jun 30, 2020
58d6462
Merge pull request #2478 from hpwamr/mui
hpwamr Jun 30, 2020
9baae2e
Update translation for zh_CN
lhmouse Jun 30, 2020
092dd45
Merge pull request #2479 from lhmouse/master
hpwamr Jun 30, 2020
036e309
HU lexer update
xsak Jun 30, 2020
435cbc7
Merge pull request #2481 from xsak/master
hpwamr Jun 30, 2020
7fbe9c9
MUI - Update translation for pt-PT
hpwamr Jun 30, 2020
667cd4c
Merge pull request #2482 from hpwamr/mui
hpwamr Jun 30, 2020
214f6cd
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 1, 2020
eea89b2
Merge branch 'grepWin_Integration' of https://github.com/RaiKoHoff/No…
RaiKoHoff Jul 1, 2020
3e106a5
MUI - grepWinNP3 update translation for sk-SK
hpwamr Jul 1, 2020
5c32e56
Merge pull request #2483 from hpwamr/mui
hpwamr Jul 1, 2020
001b96f
MUI - grepWinNP3 update translation for it-IT
hpwamr Jul 1, 2020
c99c99e
Merge pull request #2484 from hpwamr/mui
hpwamr Jul 1, 2020
0019d1b
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 2, 2020
fdc0730
+ upd: grepWin version v2.0.2 -> grepWinNP3 v2.1.2.16
RaiKoHoff Jul 2, 2020
b968099
Merge pull request #2467 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 2, 2020
f3799c8
MUI - grepWinNP3 minor correction
hpwamr Jul 2, 2020
e9f1f32
+ upd: Version files and Changes.txt
hpwamr Jul 2, 2020
b0f7a6f
+ ver: VS2019 version update - VS 16.6.3
hpwamr Jul 2, 2020
808cd40
Merge pull request #2485 from hpwamr/mui
hpwamr Jul 2, 2020
f452d6a
+ fix: disabled Find/Replace or Customize Schemes (by modal child) di…
RaiKoHoff Jul 2, 2020
a4515aa
Merge pull request #2486 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 2, 2020
88b28e9
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 2, 2020
0bec0fa
+ fix: multiple line-/stream-selection undo/redo
RaiKoHoff Jul 2, 2020
a38c445
Merge pull request #2487 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 2, 2020
0493ffd
+ upd: Version files and Changes.txt
hpwamr Jul 2, 2020
0064734
Merge pull request #2488 from hpwamr/mui
hpwamr Jul 2, 2020
987d903
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 3, 2020
e6690a7
+ upd: Oniguruma current (2020-07-03) development
RaiKoHoff Jul 3, 2020
122a80d
Merge pull request #2489 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 3, 2020
6fc33de
- chg: Change: FONT 8, "MS Shell Dlg" to: FONT 9, "Segoe UI".
hpwamr Jul 3, 2020
ace6ebd
+ upd: Changes.txt
hpwamr Jul 3, 2020
d542fba
Merge pull request #2490 from hpwamr/mui
hpwamr Jul 3, 2020
9d7ea19
MUI - Notepad3 and grepWinNP3 translations update for pl-PL
hpwamr Jul 4, 2020
315fb69
Merge pull request #2491 from hpwamr/mui
hpwamr Jul 4, 2020
057bc17
Rough translation for Notepad3/language/np3_ko_kr.
Jul 5, 2020
3fba788
Rough translation for Notepad3/minipath/language/mp_ko_kr/
Jul 6, 2020
72f3e6f
Refined ko-KR translations.
Jul 6, 2020
337a4be
Rough ko-KR translation for grepWinNP3
Jul 6, 2020
cfc55bf
Merge pull request #2492 from ohgree/ko-KR/ready
hpwamr Jul 6, 2020
5d79794
+ upd: Version files, Acknowledgments list and Changes.txt
hpwamr Jul 6, 2020
024775c
Merge pull request #2493 from hpwamr/mui
hpwamr Jul 6, 2020
3e9f3b4
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 8, 2020
3505750
+ fix: undo/redo empty selection redundancy
RaiKoHoff Jul 8, 2020
0e361e2
Merge pull request #2495 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 8, 2020
143a9db
+ upd: Version files and Changes.txt
hpwamr Jul 8, 2020
8f8c84f
Merge pull request #2496 from hpwamr/mui
hpwamr Jul 8, 2020
946ac9f
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 9, 2020
af000d7
MUI - Add Spanish Mexican (es-MX) translation project
hpwamr Jul 10, 2020
0f2bc6c
Merge pull request #2498 from hpwamr/mui
hpwamr Jul 10, 2020
43c0d3f
MUI - Minor adjustment of some field lengths for grepWinNP3
hpwamr Jul 10, 2020
1833c80
Merge pull request #2499 from hpwamr/mui
hpwamr Jul 10, 2020
2139f40
Merge remote-tracking branch 'notepad3_orig_rizone/master' into grepW…
RaiKoHoff Jul 11, 2020
76c9de5
+ fix: respect read-only file attribute of .ini-settings-file (config…
RaiKoHoff Jul 11, 2020
0c5dc4a
Merge pull request #2500 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 11, 2020
7285c1f
+ upd: Oniguruma bug fixes
RaiKoHoff Jul 11, 2020
be72dc1
Merge pull request #2501 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 11, 2020
87caddb
MUI - Minor correction in grepWinNP3 languages files
hpwamr Jul 11, 2020
9d30f87
+ upd: Version files and Changes.txt
hpwamr Jul 11, 2020
7c72c23
Merge pull request #2502 from hpwamr/mui
hpwamr Jul 11, 2020
1bc4c44
MUI - Add new strings already added in Original grepWin language files
hpwamr Jul 11, 2020
22a0d13
Merge pull request #2503 from hpwamr/mui
hpwamr Jul 11, 2020
33811e9
+ fix: Ask before overriding read-only protected configuration file.
RaiKoHoff Jul 12, 2020
3d553dc
Merge remote-tracking branch 'notepad3_orig_rizone/master' into grepW…
RaiKoHoff Jul 12, 2020
90a98d1
+ upd: grepWin/NP3) current (2020-07-12) version
RaiKoHoff Jul 12, 2020
8201471
Merge pull request #2505 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 12, 2020
b21433f
MUI - Add a new strings in all languages files
hpwamr Jul 12, 2020
9ece47b
Merge pull request #2506 from hpwamr/mui
hpwamr Jul 12, 2020
c2c1332
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 13, 2020
14208b5
MUI - grepWinNP3, sync "maximum" all languages files with original gr…
hpwamr Jul 13, 2020
7e464ad
MUI - Minor translations es-ES, fr-FR and nl-NL
hpwamr Jul 13, 2020
a9036a3
+ upd: Version files and Changes.txt
hpwamr Jul 13, 2020
e87a545
Merge pull request #2508 from hpwamr/mui
hpwamr Jul 13, 2020
f0a8050
Translation >Japanese : 2020/Jul, Readonly grepWinNP3 Capture
maboroshin Jul 13, 2020
41f2c22
Merge pull request #2509 from maboroshin/master
hpwamr Jul 13, 2020
1f4609d
grepWinNp3 Hungarian translation catching up
xsak Jul 13, 2020
769c0de
Merge pull request #2510 from xsak/master
hpwamr Jul 13, 2020
1c7f3b5
MUI - Adjust length of the fields
hpwamr Jul 13, 2020
02a22d0
Merge pull request #2511 from hpwamr/mui
hpwamr Jul 13, 2020
a7826c8
MUI - Minor corrections and update version files
hpwamr Jul 13, 2020
58a8690
Merge pull request #2512 from hpwamr/mui
hpwamr Jul 13, 2020
1e4918c
MUI - Minor corrections to fit properly in string's fields
hpwamr Jul 13, 2020
4655028
Merge pull request #2513 from hpwamr/mui
hpwamr Jul 13, 2020
7112b0c
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 14, 2020
316511d
More Hungarian translation added
xsak Jul 14, 2020
bd14542
Merge pull request #2514 from xsak/master
hpwamr Jul 14, 2020
aea6594
Shortening and adapting Hungarian strings
xsak Jul 14, 2020
4017614
Merge remote-tracking branch 'upstream/master'
xsak Jul 14, 2020
0ae896f
+ fix: small correction to grepWinNP3 component
RaiKoHoff Jul 14, 2020
ea9f626
Merge pull request #2516 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 14, 2020
86bbf01
Translation >Japanese : 2020/Jul, grepWinNP3 Capture 2ed
maboroshin Jul 14, 2020
0025e00
Merge pull request #2515 from xsak/master
hpwamr Jul 14, 2020
e0b25f4
Merge pull request #2517 from maboroshin/master
hpwamr Jul 14, 2020
daaaf37
MUI - Small correction to grepWinNP3 languages files
hpwamr Jul 14, 2020
de287ab
Merge pull request #2518 from hpwamr/mui
hpwamr Jul 14, 2020
5a12f5c
MUI - Small correction to grepWinNP3 'it-IT" language file
hpwamr Jul 14, 2020
6b4fdee
Merge pull request #2519 from hpwamr/mui
hpwamr Jul 14, 2020
928eecc
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 14, 2020
25ab7ad
Update translation for zh_CN
lhmouse Jul 15, 2020
29791ff
Merge pull request #2520 from lhmouse/master
hpwamr Jul 15, 2020
f21ca62
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 15, 2020
61699da
+ upd: Version files and Changes.txt
hpwamr Jul 15, 2020
7ee5fdf
Merge pull request #2521 from hpwamr/mui
hpwamr Jul 15, 2020
4814218
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 15, 2020
ea24d9f
MUI - Small correction to grepWinNP3 'sk-SK" language file
hpwamr Jul 15, 2020
210e626
Merge pull request #2522 from hpwamr/mui
hpwamr Jul 16, 2020
fe351f1
MUI - Correction of a few typos (punctuation) in grepWinNP3
hpwamr Jul 16, 2020
a54eca9
+ upd: Version files and Changes.txt
hpwamr Jul 16, 2020
90058b5
Merge pull request #2526 from hpwamr/mui
hpwamr Jul 16, 2020
0e19cf2
Merge remote-tracking branch 'upstream/master' into grepWin_Integration
RaiKoHoff Jul 16, 2020
3b80c3c
+ chg: review Changes.txt
RaiKoHoff Jul 16, 2020
741b317
Merge pull request #2527 from RaiKoHoff/grepWin_Integration
RaiKoHoff Jul 16, 2020
2263c2f
MUI - Fine adjustments of some length of fields for grepWinNP3.
hpwamr Jul 16, 2020
f5665be
MUI - Fine adjustments of some length of fields for grepWinNP3.
hpwamr Jul 16, 2020
0e161cf
Merge pull request #2529 from hpwamr/mui
hpwamr Jul 16, 2020
075b90b
MUI - Fine adjustments of some wording of text for grepWinNP3.
hpwamr Jul 16, 2020
b6ba940
Merge pull request #2530 from hpwamr/mui
hpwamr Jul 16, 2020
7f12004
ARM64: build most components except grepWinNP3
imbushuo Jun 26, 2020
036f857
ARM64: use vcpkg to provide boost libraries for grepWinNP3
imbushuo Jun 26, 2020
7f3dbb5
Revert WINVER & _WIN32_WINNT
imbushuo Jul 17, 2020
400415f
Use va_list everywhere
imbushuo Jul 17, 2020
00374db
Fix build break on NTDDI_WIN8+ because bEscReserved unused
imbushuo Jul 17, 2020
9a5e0b9
Merge branches
imbushuo Jul 17, 2020
26a52f2
Merge branch 'master' into arm64
imbushuo Jul 17, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 27 additions & 26 deletions Build/Changes.txt
Expand Up @@ -29,66 +29,64 @@ ONI - (ONI)guruma Regex engine
SCI - (SCI)ntilla Library
UCD - (UCD)ARDET is an Encoding Detector Library
GRE - (GRE)pWinNP3 Search in Files Tool
SUP - (S)et(UP) / Installer Package


=====================================================
Current RC1 Version 5.20.624.(build_#) (2020-06-24)
Current RC2 Version 5.20.716.(build_#) (2020-07-16)
=====================================================

-----------------------------------------------------
NEW:
-----------------------------------------------------
-
- Current grepWin dev: add feature: export search results (GRE).
- Update the grepWinNP3 icon (GRE).
- Add a grepWinNP3 Toolbar icon (GRE).
- Configurable Zoom-Tooltip clear delay ([Settings2] ZoomTooltipimeout=3200.
- Add Install/Remove "Open with Notepad3" to Notepad3 Install version.
- Add another Dark Theme "Sombra".
- grepWin: export search results (GRE).
- changed grepWinNP3 icon (GRE).
- Add Toolbar icon for grepWinNP3.
- Configurable Zoom-Tooltip display timeout ([Settings2] ZoomTooltipTimeout=3200).
- Add Install/Remove "Open with Notepad3" to Notepad3 Setup/Installer (SUP).
- Add additional Dark Theme "Sombra".
- Strip first char: allow multi-selection.
- Open default browser while clicking hyperlink tooltip.
- Open default browser while clicking tooltip (hovering hyperlink).
- Regex multi-select feature.
- Toolbar hint for zoomed view.
- "waifu2x" scaled std Toolbar bitmaps.
- Call Notepad3 with case-sensitive and dot-match-all flag (if applicable).
- Toolbar hot-button if view is zoomed (<>100%).
- Call-Back Notepad3 (from GrepWinNP3) with case-sensitive and dot-match-all flag (if applicable).
- Add "Overlapping Search" in Find/Replace dialog window.
- Integration of "grepWinNP3", a Search Tool in files (v2.1.0.10) (GRE).
- Integration of external Search-In-Files tool named "grepWinNP3" (GRE).

-----------------------------------------------------
CHANGES:
-----------------------------------------------------
-
- Silent ignore write permissions missing on Inifile.
- Replace non DPI Aware MessageBox for "Save on Close" by internal InfoBox
- Set DirectWite (D2D) rendering technology as new default.
- Two stage Toolbar reset (customizing): 1st -> settings 2nd -> factory default.
- Replace non DPI Aware MessageBox for "Save on Close" by internal InfoBox.
- Two stage Toolbar reset (customizing dialog): 1st -> settings 2nd -> factory default.
- DPI_CHANGED msg handler.
- Workaround for DPI_AWARENESS Font Size problem on DPI_CHANGE.
- Non scaled transparent image on help dialog control for Rizonesoft (standard DPI resolution).
- Enhancement of the "build_np3portableapp.cmd" file.
- Remove duplicate readme.txt, license.txt and unused files.
- Move all readme.txt, license.txt, KeyboardShortcuts.txt, etc... files
from "Notepad3Portable\Other\Help" to "Notepad3Portable\App\Notepad3\Docs"
- Review and format the license.txt file for the dialogbox of INNO Installer.
- Font style/face-name handling.
- Extended Font selection dialog (Effects).
- Font selection refactoring.
- Revised grepWinNP3.ini file creation.
- Dwrite font selection dialog.
- Minor changes for dialog handling on DPI changed.
- Preparations for dpi-aware resizable "Customize Schemes..." dialog.
- DPI change handling: About & C-Schemes dialog.
- DPI change handling: About & Schemes dialog.
- Markdown Lexer: new defaults for Header lines.
- Strip first char: do not apply on all text (empty selection).
- Reorganization Context menu.
- Bigger prev/next button-icons (Customize Schemes... dialog).
- Hyperlink double-click and MMB-click behavior.
- Filevar tag "fill-column" changes to support multi-column marker.
- Installer to let the user select the target directory.
- Default long-line wrap settings.
- Changed Default long-line wrap settings.
- Remove spinning wait-cursor for text operations (may need reactivation for long operations).
- "grepWinNP3": move packages.config to corresponding project folder (GRE).
- Add filepath to message on file locking error.
- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020/05/20).
- Update grepWinNP3 (GRE) version 2.1.3.18 (2020-07-14).
- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020/07/05).
- Update Scintilla Library (SCI) version 4.4.3 (2020/06/03).

-----------------------------------------------------
Expand All @@ -103,12 +101,16 @@ ENHANCEMENT:
FIXES:
-----------------------------------------------------
-
- Ask before overriding read-only protected configuration file.
- Respect read-only file attribute of .ini-settings-file (configuration).
- Undo/redo empty selection redundancy.
- Multiple line-/stream-selection undo/redo.
- Disabled Find/Replace or Customize Schemes (by modal child) dialog should disable main window.
- Printing scaling problem related to DPI awareness changes.
- System MessageBox "save before close" positioning.
- Reset of Toolbar configuration dialog.
- Crash if "close after find" is enabled.
- Keep current line on reverting file.
- Hardening commit_id.txt file input for version string assembling.
- Limit length of (manual) commit ID.
- DPI Aware relative positioning of position managed dialog boxes.
- DPI: awareness for Find/Replace-Dlg (remove resize property).
Expand All @@ -122,9 +124,7 @@ FIXES:
- "vcxproj" should use the latest installed SDK.
- Scintilla as DLL solution.
- Extended font style selection.
- Path is File check.
- Don't add recent file list (history) to taskbar's jump-list.
- Scroll/normalize selection in view.
- Fixing some CppCheck complaints.
- Broken x86 (32-bit) build.
- Theme scheme file handling (file extension inheritance).
Expand Down Expand Up @@ -157,9 +157,10 @@ TRANSLATIONS (MUI):
- Hindi (hi-IN) in progress...
- Indonesian (id-ID) in progress...
- Portuguese Brazilian (pt-BR) in progress...
- Vietnamese (vi-VN) in progress...
- Korean (ko-KR)in progress...
- Spanish Mexican (es-MX) in progress...
- Turkish (tr-TR) in progress...
- Vietnamese (vi-VN) in progress...
- Korean (ko-KR).
- Portuguese (pt-PT).
- Slovak (sk-SK).

Expand Down
4 changes: 4 additions & 0 deletions Build/notepad3_setup.iss
Expand Up @@ -160,6 +160,10 @@ Source: {#bindir}\Release_x64_v142\lng\es-ES\mplng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x86_v142\lng\es-ES\mplng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\es-ES\np3lng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\es-ES\np3lng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\es-MX\mplng.dll.mui; DestDir: {app}\lng\es-MX; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\es-MX\mplng.dll.mui; DestDir: {app}\lng\es-MX; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\es-MX\np3lng.dll.mui; DestDir: {app}\lng\es-MX; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\es-MX\np3lng.dll.mui; DestDir: {app}\lng\es-MX; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\fr-FR\mplng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\fr-FR\mplng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: Is64BitInstallMode()
Expand Down
2 changes: 2 additions & 0 deletions Build/notepad3_x86_setup.iss
Expand Up @@ -136,6 +136,8 @@ Source: {#bindir}\Release_x86_v142\lng\en-GB\mplng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x86_v142\lng\en-GB\np3lng.dll.mui; DestDir: {app}\lng\en-GB; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\es-ES\mplng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\es-ES\np3lng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\es-MX\mplng.dll.mui; DestDir: {app}\lng\es-MX; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\es-MX\np3lng.dll.mui; DestDir: {app}\lng\es-MX; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\fr-FR\mplng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\hi-IN\mplng.dll.mui; DestDir: {app}\lng\hi-IN; Flags: ignoreversion
Expand Down
34 changes: 34 additions & 0 deletions Notepad3.sln
Expand Up @@ -30,6 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vc
{4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} = {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E}
{7E16647B-CA40-43E8-8ABB-E4C430C186CA} = {7E16647B-CA40-43E8-8ABB-E4C430C186CA}
{2EB07C98-0F3F-4CB6-B448-099770AF1989} = {2EB07C98-0F3F-4CB6-B448-099770AF1989}
{B6757299-D2DD-4103-834D-45227AC13CB7} = {B6757299-D2DD-4103-834D-45227AC13CB7}
{3B8C289D-FF47-4237-AD7B-0702230F41A3} = {3B8C289D-FF47-4237-AD7B-0702230F41A3}
{82BD93B4-0306-4DDC-87F6-84B906DBAA77} = {82BD93B4-0306-4DDC-87F6-84B906DBAA77}
{C8DF31BC-9280-4663-93DF-FDCFFC298269} = {C8DF31BC-9280-4663-93DF-FDCFFC298269}
Expand All @@ -48,6 +49,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa
{954B9D26-1735-4674-8279-FF2C44E4258B} = {954B9D26-1735-4674-8279-FF2C44E4258B}
{CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1} = {CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}
{B3CF6147-AD32-4238-B6C5-9A88BA503567} = {B3CF6147-AD32-4238-B6C5-9A88BA503567}
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} = {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}
{6503214A-CE25-45B5-84BB-61EEFB35D1A9} = {6503214A-CE25-45B5-84BB-61EEFB35D1A9}
{DA372A4B-7AE0-4C50-97B7-49D5FF953325} = {DA372A4B-7AE0-4C50-97B7-49D5FF953325}
{8CA91C67-2C5E-4983-8EA1-AF4675211A2C} = {8CA91C67-2C5E-4983-8EA1-AF4675211A2C}
Expand Down Expand Up @@ -332,6 +334,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_hi_in", "minipath\langua
{29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_es_mx", "language\np3_es_mx\np3_es_mx.vcxproj", "{B6757299-D2DD-4103-834D-45227AC13CB7}"
ProjectSection(ProjectDependencies) = postProject
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_es_mx", "minipath\language\mp_es_mx\mp_es_mx.vcxproj", "{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}"
ProjectSection(ProjectDependencies) = postProject
{29AB36E1-284E-4E0B-9DF4-F4F84760BD9B} = {29AB36E1-284E-4E0B-9DF4-F4F84760BD9B}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Expand Down Expand Up @@ -970,6 +982,26 @@ Global
{CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}.Release|Win32.Build.0 = Release|Win32
{CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}.Release|x64.ActiveCfg = Release|x64
{CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}.Release|x64.Build.0 = Release|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM64.ActiveCfg = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.ActiveCfg = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.Build.0 = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.ActiveCfg = Debug|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.Build.0 = Debug|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM64.ActiveCfg = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.ActiveCfg = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.Build.0 = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.ActiveCfg = Release|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.Build.0 = Release|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM64.ActiveCfg = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.ActiveCfg = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.Build.0 = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.ActiveCfg = Debug|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.Build.0 = Debug|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM64.ActiveCfg = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.ActiveCfg = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.Build.0 = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.ActiveCfg = Release|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1030,6 +1062,8 @@ Global
{85333322-C153-4101-89BB-36B8EF86DFEF} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}
{55D166D9-9B48-4048-9EDC-856066F60C87} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}
{CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1} = {8FD783D5-8709-432D-A88E-6E3073AFF220}
{B6757299-D2DD-4103-834D-45227AC13CB7} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} = {8FD783D5-8709-432D-A88E-6E3073AFF220}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C0B8FE68-ECBC-4173-9027-E1EC2C9B5BDF}
Expand Down
1 change: 1 addition & 0 deletions Readme.txt
Expand Up @@ -110,6 +110,7 @@ lhmouse https://github.com/lhmouse/
ltGuillaume https://github.com/ltGuillaume/
maboroshin https://github.com/maboroshin/
MadDogVachon https://github.com/MadDogVachon/
ohgree https://github.com/ohgree/
RaffaeleBianc0 https://github.com/RaffaeleBianc0/
rizonesoft https://github.com/rizonesoft/
Rudolfin https://github.com/Rudolfin/
Expand Down
2 changes: 1 addition & 1 deletion Version_RC.cmd
@@ -1,6 +1,6 @@
@echo off
setlocal
set _VERPATCH_=RC1
set _VERPATCH_=RC2
echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt
Version -VerPatch "%_VERPATCH_%"
endlocal
2 changes: 1 addition & 1 deletion Versions/day.txt
@@ -1 +1 @@
624
716
2 changes: 1 addition & 1 deletion grepWinNP3/README.md
Expand Up @@ -9,7 +9,7 @@ grepWin is a simple search and replace tool which can use [regular expressions](

In case you're not familiar with regular expressions, we have a very short [regular expression tutorial](https://tools.stefankueng.com/regexhelp.html) for you.

[![grepWin](https://raw.githubusercontent.com/stefankueng/grepWin/master/src/Resources/grepWin_search-small.png)](https://raw.githubusercontent.com/stefankueng/grepWin/master/src/Resources/grepWin_search.png)
[![grepWin](https://github.com/stefankueng/grepWin/raw/main/src/Resources/grepWin_search-small.png)](https://github.com/stefankueng/grepWin/raw/main/src/Resources/grepWin_search.png)

# Command line parameters
The command line parameters are listed on a [separate page](https://tools.stefankueng.com/grepWin_cmd.html).
Expand Down
5 changes: 5 additions & 0 deletions grepWinNP3/default.build
Expand Up @@ -199,6 +199,7 @@
</buildfiles>
</nant>
<property name="verstring" value="${environment::get-variable('MajorVersion')}.${environment::get-variable('MinorVersion')}.${environment::get-variable('MicroVersion')}" />
<property name="verstringfull" value="${verstring}.${environment::get-variable('WCREV')}" />
<copy file="bin\Release\grepWin.exe" tofile="bin\grepWin-${verstring}_portable.exe" />
<copy file="bin\Release64\grepWin.exe" tofile="bin\grepWin-x64-${verstring}_portable.exe" />

Expand All @@ -216,6 +217,10 @@
<arg value="bin\grepWin-${verstring}-x64.msi" />
</exec>
<loadfile file="bin\checksum64.txt" property="checksum64" />
<!-- now write the version.txt file -->
<echo file="version.txt">${verstringfull}
https://tools.stefankueng.com/grepWin.html
</echo>

<loadfile file="choco\grepwin.nuspec" property="nuspecfile">
<filterchain>
Expand Down
12 changes: 6 additions & 6 deletions grepWinNP3/grepWinNP3.vcxproj
Expand Up @@ -430,16 +430,16 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" Condition="'$(Platform)'!='ARM64'">
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\packages\boost.1.71.0.0\build\boost.targets" Condition="Exists('..\packages\boost.1.71.0.0\build\boost.targets')" />
<Import Project="..\packages\boost_iostreams-vc142.1.71.0.0\build\boost_iostreams-vc142.targets" Condition="Exists('..\packages\boost_iostreams-vc142.1.71.0.0\build\boost_iostreams-vc142.targets')" />
<Import Project="..\packages\boost_regex-vc142.1.71.0.0\build\boost_regex-vc142.targets" Condition="Exists('..\packages\boost_regex-vc142.1.71.0.0\build\boost_regex-vc142.targets')" />
<Import Project="..\packages\boost.1.72.0.0\build\boost.targets" Condition="Exists('..\packages\boost.1.72.0.0\build\boost.targets')" />
<Import Project="..\packages\boost_iostreams-vc142.1.72.0.0\build\boost_iostreams-vc142.targets" Condition="Exists('..\packages\boost_iostreams-vc142.1.72.0.0\build\boost_iostreams-vc142.targets')" />
<Import Project="..\packages\boost_regex-vc142.1.72.0.0\build\boost_regex-vc142.targets" Condition="Exists('..\packages\boost_regex-vc142.1.72.0.0\build\boost_regex-vc142.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(Platform)'!='ARM64'">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\boost.1.71.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.71.0.0\build\boost.targets'))" />
<Error Condition="!Exists('..\packages\boost_iostreams-vc142.1.71.0.0\build\boost_iostreams-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_iostreams-vc142.1.71.0.0\build\boost_iostreams-vc142.targets'))" />
<Error Condition="!Exists('..\packages\boost_regex-vc142.1.71.0.0\build\boost_regex-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_regex-vc142.1.71.0.0\build\boost_regex-vc142.targets'))" />
<Error Condition="!Exists('..\packages\boost.1.72.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.72.0.0\build\boost.targets'))" />
<Error Condition="!Exists('..\packages\boost_iostreams-vc142.1.72.0.0\build\boost_iostreams-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_iostreams-vc142.1.72.0.0\build\boost_iostreams-vc142.targets'))" />
<Error Condition="!Exists('..\packages\boost_regex-vc142.1.72.0.0\build\boost_regex-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_regex-vc142.1.72.0.0\build\boost_regex-vc142.targets'))" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions grepWinNP3/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.71.0.0" targetFramework="native" />
<package id="boost_iostreams-vc142" version="1.71.0.0" targetFramework="native" />
<package id="boost_regex-vc142" version="1.71.0.0" targetFramework="native" />
<package id="boost" version="1.72.0.0" targetFramework="native" />
<package id="boost_iostreams-vc142" version="1.72.0.0" targetFramework="native" />
<package id="boost_regex-vc142" version="1.72.0.0" targetFramework="native" />
</packages>