Skip to content

Commit b254b2d

Browse files
RaiKoHoffRaiKoHoff
authored
Merge pull request #5637 from RaiKoHoff/Dev_Master
fix: build-scripts
2 parents 1d5fb45 + 513cc95 commit b254b2d

13 files changed

Lines changed: 245 additions & 240 deletions

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Thumbs.db
5353
/test/test.log
5454
/Notepad3.VC.VC.opendb
5555

56+
/grepWin/portables/*.zip
57+
5658
/np3portableapp/Signing*.cmd
5759
/np3portableapp/Signing*.txt
5860
/np3portableapp/Notepad3Portable*.7z
@@ -63,6 +65,8 @@ Thumbs.db
6365
/np3portableapp/Notepad3Portable/App/Notepad3/x64/lng
6466
/np3portableapp/Notepad3Portable/App/Notepad3/x86/*.exe
6567
/np3portableapp/Notepad3Portable/App/Notepad3/x86/lng
68+
/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
69+
/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
6670
#
6771

6872
# Upgrade staging directory

‎Build/make_portable_alpha(.7z).cmd‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ rem * https://rizonesoft.com
1717
rem * *
1818
rem ******************************************************************************
1919

20-
CD /D %~dp0
20+
PUSHD %~dp0
21+
22+
rem SET SEVENZIP=%~dp07za.exe
2123

2224
rem Check for the help switches
2325
IF /I "%~1" == "help" GOTO SHOWHELP
@@ -33,12 +35,12 @@ SET TEMP_NAME="make_portable_temp"
3335

3436
IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
3537
IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
36-
IF NOT EXIST "..\%INPUTDIRx86%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x86 first!"
3738
IF NOT EXIST "..\%INPUTDIRx86%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x86 first!"
3839
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
3940
IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
40-
IF NOT EXIST "..\%INPUTDIRx64%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x64 first!"
4141
IF NOT EXIST "..\%INPUTDIRx64%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
42+
IF NOT EXIST "..\grepWin\portables\grepWin-x86_portable.exe" CALL :SUBMSG "ERROR" "grepWin x86 portable not found in grepWin\portables\!"
43+
IF NOT EXIST "..\grepWin\portables\grepWin-x64_portable.exe" CALL :SUBMSG "ERROR" "grepWin x64 portable not found in grepWin\portables\!"
4244

4345
CALL :SubGetVersion
4446
CALL :SubDetectSevenzipPath
@@ -79,7 +81,9 @@ ECHO.
7981
:: ===========================================================================================
8082
ping -n 9 127.0.0.1>nul
8183

84+
POPD
8285
ENDLOCAL
86+
::PAUSE
8387
EXIT /B
8488

8589

@@ -91,18 +95,21 @@ IF EXIST "%TEMP_NAME%" RD /S /Q "%TEMP_NAME%"
9195
IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%"
9296
IF NOT EXIST "Packages" MD "Packages"
9397

94-
FOR %%A IN ("..\License.txt" "..\Readme.txt" "..\grepWinNP3\grepWinLicense.txt" "Notepad3.ini" "minipath.ini"^
95-
"..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\grepWinNP3.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
98+
FOR %%A IN ("..\License.txt" "..\Readme.txt" "Notepad3.ini" "minipath.ini"^
99+
"..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
96100

97101
SET "LNG=%TEMP_NAME%\lng"
98-
SET "GRP=%TEMP_NAME%\lng\gwLng\"
102+
SET "GREPWIN=%TEMP_NAME%\grepWin"
99103
SET "THEMES=%TEMP_NAME%\Themes"
100104
SET "DOCS=%TEMP_NAME%\Docs"
101105
IF NOT EXIST %LNG% MD %LNG%
106+
IF NOT EXIST %GREPWIN% MD %GREPWIN%
102107
IF NOT EXIST %THEMES% MD %THEMES%
103108
IF NOT EXIST %DOCS% MD %DOCS%
104109
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
105-
XCOPY /E /Y /V "..\%1\lng\gwLng\" "%GRP%"
110+
COPY /Y /V "..\grepWin\portables\grepWin-%2_portable.exe" "%GREPWIN%\"
111+
COPY /Y /V "..\grepWin\portables\LICENSE.txt" "%GREPWIN%\"
112+
XCOPY /Y /V "..\grepWin\translations\*.lang" "%GREPWIN%\"
106113
XCOPY /E /Y /V "Themes" "%THEMES%"
107114
XCOPY /E /Y /V "Docs" "%DOCS%"
108115
COPY /Y /V "Changes.txt" "%DOCS%"
@@ -111,9 +118,9 @@ SET "FAVORITES=%TEMP_NAME%\Favorites"
111118
IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
112119

113120
PUSHD "%TEMP_NAME%"
114-
"%SEVENZIP%" a -t7z -ms=on -mx=7^
115-
"%ZIP_NAME%.7z" "License.txt" "Notepad3.exe" "Notepad3.ini" "grepWinLicense.txt" "Readme.txt"^
116-
"Favorites" "minipath.exe" "minipath.ini" "grepWinNP3.exe" "np3encrypt.exe" "lng" "Themes" "Docs">NUL
121+
"%SEVENZIP%" a -t7z -m0=lzma2 -ms=on -mx=9^
122+
"%ZIP_NAME%.7z" "License.txt" "Notepad3.exe" "Notepad3.ini" "Readme.txt"^
123+
"Favorites" "minipath.exe" "minipath.ini" "np3encrypt.exe" "grepWin" "lng" "Themes" "Docs">NUL
117124
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
118125

119126
CALL :SUBMSG "INFO" "%ZIP_NAME%.7z created successfully!"

‎Build/make_portable_beta(.7z).cmd‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ rem * https://rizonesoft.com
1717
rem * *
1818
rem ******************************************************************************
1919

20-
CD /D %~dp0
20+
PUSHD %~dp0
21+
22+
rem SET SEVENZIP=%~dp07za.exe
2123

2224
rem Check for the help switches
2325
IF /I "%~1" == "help" GOTO SHOWHELP
@@ -33,12 +35,12 @@ SET TEMP_NAME="make_portable_temp"
3335

3436
IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
3537
IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
36-
IF NOT EXIST "..\%INPUTDIRx86%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x86 first!"
3738
IF NOT EXIST "..\%INPUTDIRx86%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x86 first!"
3839
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
3940
IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
40-
IF NOT EXIST "..\%INPUTDIRx64%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x64 first!"
4141
IF NOT EXIST "..\%INPUTDIRx64%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
42+
IF NOT EXIST "..\grepWin\portables\grepWin-x86_portable.exe" CALL :SUBMSG "ERROR" "grepWin x86 portable not found in grepWin\portables\!"
43+
IF NOT EXIST "..\grepWin\portables\grepWin-x64_portable.exe" CALL :SUBMSG "ERROR" "grepWin x64 portable not found in grepWin\portables\!"
4244

4345
CALL :SubGetVersion
4446
CALL :SubDetectSevenzipPath
@@ -79,7 +81,9 @@ ECHO.
7981
:: ===========================================================================================
8082
ping -n 9 127.0.0.1>nul
8183

84+
POPD
8285
ENDLOCAL
86+
::PAUSE
8387
EXIT /B
8488

8589

@@ -91,18 +95,21 @@ IF EXIST "%TEMP_NAME%" RD /S /Q "%TEMP_NAME%"
9195
IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%"
9296
IF NOT EXIST "Packages" MD "Packages"
9397

94-
FOR %%A IN ("..\License.txt" "..\Readme.txt" "..\grepWinNP3\grepWinLicense.txt" "Notepad3.ini" "minipath.ini"^
95-
"..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\grepWinNP3.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
98+
FOR %%A IN ("..\License.txt" "..\Readme.txt" "Notepad3.ini" "minipath.ini"^
99+
"..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
96100

97101
SET "LNG=%TEMP_NAME%\lng"
98-
SET "GRP=%TEMP_NAME%\lng\gwLng\"
102+
SET "GREPWIN=%TEMP_NAME%\grepWin"
99103
SET "THEMES=%TEMP_NAME%\Themes"
100104
SET "DOCS=%TEMP_NAME%\Docs"
101105
IF NOT EXIST %LNG% MD %LNG%
106+
IF NOT EXIST %GREPWIN% MD %GREPWIN%
102107
IF NOT EXIST %THEMES% MD %THEMES%
103108
IF NOT EXIST %DOCS% MD %DOCS%
104109
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
105-
XCOPY /E /Y /V "..\%1\lng\gwLng\" "%GRP%"
110+
COPY /Y /V "..\grepWin\portables\grepWin-%2_portable.exe" "%GREPWIN%\"
111+
COPY /Y /V "..\grepWin\portables\LICENSE.txt" "%GREPWIN%\"
112+
XCOPY /Y /V "..\grepWin\translations\*.lang" "%GREPWIN%\"
106113
XCOPY /E /Y /V "Themes" "%THEMES%"
107114
XCOPY /E /Y /V "Docs" "%DOCS%"
108115
COPY /Y /V "Changes.txt" "%DOCS%"
@@ -111,9 +118,9 @@ SET "FAVORITES=%TEMP_NAME%\Favorites"
111118
IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
112119

113120
PUSHD "%TEMP_NAME%"
114-
"%SEVENZIP%" a -t7z -ms=on -mx=7^
115-
"%ZIP_NAME%.7z" "License.txt" "Notepad3.exe" "Notepad3.ini" "grepWinLicense.txt" "Readme.txt"^
116-
"Favorites" "minipath.exe" "minipath.ini" "grepWinNP3.exe" "np3encrypt.exe" "lng" "Themes" "Docs">NUL
121+
"%SEVENZIP%" a -t7z -m0=lzma2 -ms=on -mx=9^
122+
"%ZIP_NAME%.7z" "License.txt" "Notepad3.exe" "Notepad3.ini" "Readme.txt"^
123+
"Favorites" "minipath.exe" "minipath.ini" "np3encrypt.exe" "grepWin" "lng" "Themes" "Docs">NUL
117124
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
118125

119126
CALL :SUBMSG "INFO" "%ZIP_NAME%.7z created successfully!"

‎Build/make_portable_rel(.zip).cmd‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ rem * https://rizonesoft.com
1717
rem * *
1818
rem ******************************************************************************
1919

20-
CD /D %~dp0
20+
PUSHD %~dp0
21+
22+
rem SET SEVENZIP=%~dp07za.exe
2123

2224
rem Check for the help switches
2325
IF /I "%~1" == "help" GOTO SHOWHELP
@@ -33,12 +35,12 @@ SET TEMP_NAME="make_portable_temp"
3335

3436
IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
3537
IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
36-
::IF NOT EXIST "..\%INPUTDIRx86%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x86 first!"
3738
IF NOT EXIST "..\%INPUTDIRx86%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x86 first!"
3839
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
3940
IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
40-
::IF NOT EXIST "..\%INPUTDIRx64%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile grepWinNP3 x64 first!"
4141
IF NOT EXIST "..\%INPUTDIRx64%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
42+
IF NOT EXIST "..\grepWin\portables\grepWin-x86_portable.exe" CALL :SUBMSG "ERROR" "grepWin x86 portable not found in grepWin\portables\!"
43+
IF NOT EXIST "..\grepWin\portables\grepWin-x64_portable.exe" CALL :SUBMSG "ERROR" "grepWin x64 portable not found in grepWin\portables\!"
4244

4345
CALL :SubGetVersion
4446
CALL :SubDetectSevenzipPath
@@ -79,7 +81,9 @@ ECHO.
7981
:: ===========================================================================================
8082
ping -n 9 127.0.0.1>nul
8183

84+
POPD
8285
ENDLOCAL
86+
::PAUSE
8387
EXIT /B
8488

8589

@@ -95,14 +99,17 @@ FOR %%A IN ("..\License.txt" "..\Readme.txt" "Notepad3.ini" "minipath.ini"^
9599
"..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\np3encrypt.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
96100

97101
SET "LNG=%TEMP_NAME%\lng"
98-
SET "GRP=%TEMP_NAME%\lng\gwLng\"
102+
SET "GREPWIN=%TEMP_NAME%\grepWin"
99103
SET "THEMES=%TEMP_NAME%\Themes"
100104
SET "DOCS=%TEMP_NAME%\Docs"
101105
IF NOT EXIST %LNG% MD %LNG%
106+
IF NOT EXIST %GREPWIN% MD %GREPWIN%
102107
IF NOT EXIST %THEMES% MD %THEMES%
103108
IF NOT EXIST %DOCS% MD %DOCS%
104109
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
105-
XCOPY /E /Y /V "..\%1\lng\gwLng\" "%GRP%"
110+
COPY /Y /V "..\grepWin\portables\grepWin-%2_portable.exe" "%GREPWIN%\"
111+
COPY /Y /V "..\grepWin\portables\LICENSE.txt" "%GREPWIN%\"
112+
XCOPY /Y /V "..\grepWin\translations\*.lang" "%GREPWIN%\"
106113
XCOPY /E /Y /V "Themes" "%THEMES%"
107114
XCOPY /E /Y /V "Docs" "%DOCS%"
108115
COPY /Y /V "Changes.txt" "%DOCS%"
@@ -111,9 +118,9 @@ SET "FAVORITES=%TEMP_NAME%\Favorites"
111118
IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
112119

113120
PUSHD "%TEMP_NAME%"
114-
"%SEVENZIP%" a -tzip -mcu=on -mx=7^
115-
"%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Notepad3.ini" "grepWinLicense.txt" "Readme.txt"^
116-
"Favorites" "minipath.exe" "minipath.ini" "grepWinNP3.exe" "np3encrypt.exe" "lng" "Themes" "Docs">NUL
121+
"%SEVENZIP%" a -tzip -mcu=on -mx=9^
122+
"%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Notepad3.ini" "Readme.txt"^
123+
"Favorites" "minipath.exe" "minipath.ini" "np3encrypt.exe" "grepWin" "lng" "Themes" "Docs">NUL
117124
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
118125

119126
CALL :SUBMSG "INFO" "%ZIP_NAME%.zip created successfully!"

‎grepWin/portables/grepWin-2.1.12_portable.zip‎

-609 KB
Binary file not shown.

‎grepWin/portables/grepWin-x64-2.1.12_portable.zip‎

-676 KB
Binary file not shown.

‎np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ NOTEPAD3_PORTABLE_SETTINGS=%PAL:DataDir%\settings
4343

4444
[RegistryKeys]
4545
;This section allows you to backup and restore a given key and the keys below it within the registry. Any existing data in the same location will be backed up before the app is run and restored on exit. The portable app's data will be stored in a .reg key with the name at the beginning of each line within the Data directory. It's best to take as little of the registry as possible. In our example, taking the whole ExamplePublisher section isn't necessary because all our app's data is stored within AppName. If we took ExamplePublisher, we might run into problems with other apps from the same publisher.
46-
AppName=HKCU\Software\ExamplePublisher\AppName
46+
;AppName=HKCU\Software\ExamplePublisher\AppName
4747
;If there is some data in the registry that the app creates but does not need to be saved between sessions of the portable app, it can be handled using a - instead of a name for a .reg file as follows:
4848
;-=HKCU\Software\ExamplePublisher\GarbageData
4949

‎np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Version=3.9
77
Name=Notepad3PortablexxxDEVNAMExxx
88
AppId=Notepad3Portable
99
BaseAppName=Notepad3
10-
Publisher=Notepad3 Contibutors & Rizonesoft & PortableApps.com
10+
Publisher=Notepad3 Contributors & Rizonesoft & PortableApps.com
1111
Homepage=PortableApps.com/Notepad3Portable
1212
Category=Development
1313
Description=A Lightweight Universal Text Editor

‎np3portableapp/Notepad3Portable/App/AppInfo/installer.ini‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)