Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ Thumbs.db
/test/test.log
/Notepad3.VC.VC.opendb

/grepWin/portables/*.zip

/np3portableapp/Signing*.cmd
/np3portableapp/Signing*.txt
/np3portableapp/Notepad3Portable*.7z
Expand All @@ -63,6 +65,8 @@ Thumbs.db
/np3portableapp/Notepad3Portable/App/Notepad3/x64/lng
/np3portableapp/Notepad3Portable/App/Notepad3/x86/*.exe
/np3portableapp/Notepad3Portable/App/Notepad3/x86/lng
/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
#

# Upgrade staging directory
Expand Down
27 changes: 17 additions & 10 deletions Build/make_portable_alpha(.7z).cmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ rem * https://rizonesoft.com
rem * *
rem ******************************************************************************

CD /D %~dp0
PUSHD %~dp0

rem SET SEVENZIP=%~dp07za.exe

rem Check for the help switches
IF /I "%~1" == "help" GOTO SHOWHELP
Expand All @@ -33,12 +35,12 @@ 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%\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%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
IF NOT EXIST "..\grepWin\portables\grepWin-x86_portable.exe" CALL :SUBMSG "ERROR" "grepWin x86 portable not found in grepWin\portables\!"
IF NOT EXIST "..\grepWin\portables\grepWin-x64_portable.exe" CALL :SUBMSG "ERROR" "grepWin x64 portable not found in grepWin\portables\!"

CALL :SubGetVersion
CALL :SubDetectSevenzipPath
Expand Down Expand Up @@ -79,7 +81,9 @@ ECHO.
:: ===========================================================================================
ping -n 9 127.0.0.1>nul

POPD
ENDLOCAL
::PAUSE
EXIT /B


Expand All @@ -91,18 +95,21 @@ 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\"
SET "GREPWIN=%TEMP_NAME%\grepWin"
SET "THEMES=%TEMP_NAME%\Themes"
SET "DOCS=%TEMP_NAME%\Docs"
IF NOT EXIST %LNG% MD %LNG%
IF NOT EXIST %GREPWIN% MD %GREPWIN%
IF NOT EXIST %THEMES% MD %THEMES%
IF NOT EXIST %DOCS% MD %DOCS%
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
XCOPY /E /Y /V "..\%1\lng\gwLng\" "%GRP%"
COPY /Y /V "..\grepWin\portables\grepWin-%2_portable.exe" "%GREPWIN%\"
COPY /Y /V "..\grepWin\portables\LICENSE.txt" "%GREPWIN%\"
XCOPY /Y /V "..\grepWin\translations\*.lang" "%GREPWIN%\"
XCOPY /E /Y /V "Themes" "%THEMES%"
XCOPY /E /Y /V "Docs" "%DOCS%"
COPY /Y /V "Changes.txt" "%DOCS%"
Expand All @@ -111,9 +118,9 @@ SET "FAVORITES=%TEMP_NAME%\Favorites"
IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"

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

CALL :SUBMSG "INFO" "%ZIP_NAME%.7z created successfully!"
Expand Down
27 changes: 17 additions & 10 deletions Build/make_portable_beta(.7z).cmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ rem * https://rizonesoft.com
rem * *
rem ******************************************************************************

CD /D %~dp0
PUSHD %~dp0

rem SET SEVENZIP=%~dp07za.exe

rem Check for the help switches
IF /I "%~1" == "help" GOTO SHOWHELP
Expand All @@ -33,12 +35,12 @@ 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%\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%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
IF NOT EXIST "..\grepWin\portables\grepWin-x86_portable.exe" CALL :SUBMSG "ERROR" "grepWin x86 portable not found in grepWin\portables\!"
IF NOT EXIST "..\grepWin\portables\grepWin-x64_portable.exe" CALL :SUBMSG "ERROR" "grepWin x64 portable not found in grepWin\portables\!"

CALL :SubGetVersion
CALL :SubDetectSevenzipPath
Expand Down Expand Up @@ -79,7 +81,9 @@ ECHO.
:: ===========================================================================================
ping -n 9 127.0.0.1>nul

POPD
ENDLOCAL
::PAUSE
EXIT /B


Expand All @@ -91,18 +95,21 @@ 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\"
SET "GREPWIN=%TEMP_NAME%\grepWin"
SET "THEMES=%TEMP_NAME%\Themes"
SET "DOCS=%TEMP_NAME%\Docs"
IF NOT EXIST %LNG% MD %LNG%
IF NOT EXIST %GREPWIN% MD %GREPWIN%
IF NOT EXIST %THEMES% MD %THEMES%
IF NOT EXIST %DOCS% MD %DOCS%
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
XCOPY /E /Y /V "..\%1\lng\gwLng\" "%GRP%"
COPY /Y /V "..\grepWin\portables\grepWin-%2_portable.exe" "%GREPWIN%\"
COPY /Y /V "..\grepWin\portables\LICENSE.txt" "%GREPWIN%\"
XCOPY /Y /V "..\grepWin\translations\*.lang" "%GREPWIN%\"
XCOPY /E /Y /V "Themes" "%THEMES%"
XCOPY /E /Y /V "Docs" "%DOCS%"
COPY /Y /V "Changes.txt" "%DOCS%"
Expand All @@ -111,9 +118,9 @@ SET "FAVORITES=%TEMP_NAME%\Favorites"
IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"

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

CALL :SUBMSG "INFO" "%ZIP_NAME%.7z created successfully!"
Expand Down
23 changes: 15 additions & 8 deletions Build/make_portable_rel(.zip).cmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ rem * https://rizonesoft.com
rem * *
rem ******************************************************************************

CD /D %~dp0
PUSHD %~dp0

rem SET SEVENZIP=%~dp07za.exe

rem Check for the help switches
IF /I "%~1" == "help" GOTO SHOWHELP
Expand All @@ -33,12 +35,12 @@ 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%\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%\np3encrypt.exe" CALL :SUBMSG "ERROR" "Compile np3encrypt x64 first!"
IF NOT EXIST "..\grepWin\portables\grepWin-x86_portable.exe" CALL :SUBMSG "ERROR" "grepWin x86 portable not found in grepWin\portables\!"
IF NOT EXIST "..\grepWin\portables\grepWin-x64_portable.exe" CALL :SUBMSG "ERROR" "grepWin x64 portable not found in grepWin\portables\!"

CALL :SubGetVersion
CALL :SubDetectSevenzipPath
Expand Down Expand Up @@ -79,7 +81,9 @@ ECHO.
:: ===========================================================================================
ping -n 9 127.0.0.1>nul

POPD
ENDLOCAL
::PAUSE
EXIT /B


Expand All @@ -95,14 +99,17 @@ 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\"
SET "GREPWIN=%TEMP_NAME%\grepWin"
SET "THEMES=%TEMP_NAME%\Themes"
SET "DOCS=%TEMP_NAME%\Docs"
IF NOT EXIST %LNG% MD %LNG%
IF NOT EXIST %GREPWIN% MD %GREPWIN%
IF NOT EXIST %THEMES% MD %THEMES%
IF NOT EXIST %DOCS% MD %DOCS%
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
XCOPY /E /Y /V "..\%1\lng\gwLng\" "%GRP%"
COPY /Y /V "..\grepWin\portables\grepWin-%2_portable.exe" "%GREPWIN%\"
COPY /Y /V "..\grepWin\portables\LICENSE.txt" "%GREPWIN%\"
XCOPY /Y /V "..\grepWin\translations\*.lang" "%GREPWIN%\"
XCOPY /E /Y /V "Themes" "%THEMES%"
XCOPY /E /Y /V "Docs" "%DOCS%"
COPY /Y /V "Changes.txt" "%DOCS%"
Expand All @@ -111,9 +118,9 @@ SET "FAVORITES=%TEMP_NAME%\Favorites"
IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"

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

CALL :SUBMSG "INFO" "%ZIP_NAME%.zip created successfully!"
Expand Down
Binary file removed grepWin/portables/grepWin-2.1.12_portable.zip
Binary file not shown.
Binary file removed grepWin/portables/grepWin-x64-2.1.12_portable.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ NOTEPAD3_PORTABLE_SETTINGS=%PAL:DataDir%\settings

[RegistryKeys]
;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.
AppName=HKCU\Software\ExamplePublisher\AppName
;AppName=HKCU\Software\ExamplePublisher\AppName
;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:
;-=HKCU\Software\ExamplePublisher\GarbageData

Expand Down
30 changes: 0 additions & 30 deletions np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Version=3.9
Name=Notepad3PortablexxxDEVNAMExxx
AppId=Notepad3Portable
BaseAppName=Notepad3
Publisher=Notepad3 Contibutors & Rizonesoft & PortableApps.com
Publisher=Notepad3 Contributors & Rizonesoft & PortableApps.com
Homepage=PortableApps.com/Notepad3Portable
Category=Development
Description=A Lightweight Universal Text Editor
Expand Down
42 changes: 0 additions & 42 deletions np3portableapp/Notepad3Portable/App/AppInfo/installer.ini

This file was deleted.

Loading
Loading