diff --git a/Version_RC.cmd b/Version_RC.cmd index f821f134a..ac0908092 100644 --- a/Version_RC.cmd +++ b/Version_RC.cmd @@ -1,2 +1,6 @@ @echo off -Version -VerPatch "RC" +setlocal +set _VERPATCH_=RC +echo.%_VERPATCH_%> .\np3portableapp\_buildname.txt +Version -VerPatch "%_VERPATCH_%" +endlocal diff --git a/Version_develop.cmd b/Version_develop.cmd index 224eff83d..8a8705963 100644 --- a/Version_develop.cmd +++ b/Version_develop.cmd @@ -1,2 +1,6 @@ @echo off -Version -VerPatch "develop" +setlocal +set _VERPATCH_=develop +echo.%_VERPATCH_%> .\np3portableapp\_buildname.txt +Version -VerPatch "%_VERPATCH_%" +endlocal diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini index 37a012560..d26d84804 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini @@ -4,9 +4,9 @@ Type=PortableAppsFormat Version=3.5 [Details] -Name=Notepad3Portable -AppId=Notepad3Portable -Publisher=Notepad3 Contibutors & Rizonesoft® & PortableApps.com +Name=Notepad3PortablexxxDEVNAMExxx +AppId=Notepad3PortablexxxDEVNAMExxx +Publisher=Notepad3 Contibutors & Rizonesoft & PortableApps.com Homepage=https://rizonesoft.com Category=Development Description=A lightweight universal Texteditor diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini index 59e8b03bb..755f1625c 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini @@ -1,16 +1,11 @@ -;This is an example installer.ini that is part of the PortableApps.com Template -;It uses a standard Windows INI format, so any line starting with a semi-colon is treated as a comment -;It is recommended that you use a coding text editor to edit this -;If editing with Notepad++, be sure you have turned off the option to add a BOM as it will break the INI -; -;This file is not normally needed for the majority of apps. We recommend including it for any apps that must have user settings moved to App when running and back to Data when closed. That way, if Windows crashes/restarts or an unsafe eject is done and the user then upgrades the app without running it first so that the PA.c Launcher can clean up the data, no data is lost -; -;Full details on this file: http://portableapps.com/development/portableapps.com_format#installer - +[CheckRunning] +[Source] +[MainDirectories] +[OptionalComponents] +[CopyLocalFiles] +[DownloadFiles] +[Languages] [DirectoriesToPreserve] -;This indicates to the installer that these files will be preserved. We do this so that the fictitious portable configuration directory we handle in the example AppNamePortable.ini isn't lost if a crash and the upgrade occurs. -;PreserveDirectory1=App\AppName\Config - +[DirectoriesToRemove] [FilesToPreserve] -;This indicates to the installer that these files will be preserved. Wildcards are supported. We do this so that the fictitious portable configuration file we handle in the example AppNamePortable.ini isn't lost if a crash and the upgrade occurs. -;PreserveFile1=App\AppName\appnameportableexample.config \ No newline at end of file +[FilesToRemove] diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini new file mode 100644 index 000000000..a522fc622 --- /dev/null +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini @@ -0,0 +1,153 @@ +;This is an example installer.ini that is part of the PortableApps.com Template +;It uses a standard Windows INI format, so any line starting with a semi-colon is treated as a comment +;It is recommended that you use a coding text editor to edit this +;If editing with Notepad++, be sure you have turned off the option to add a BOM as it will break the INI +; +;This file is not normally needed for the majority of apps. We recommend including it for any apps that must have user settings moved to App when running and back to Data when closed. That way, if Windows crashes/restarts or an unsafe eject is done and the user then upgrades the app without running it first so that the PA.c Launcher can clean up the data, no data is lost +; +;Full details on this file: http://portableapps.com/development/portableapps.com_format#installer + +[CheckRunning] +;CloseEXE=Custom.exe +;CloseName=AppName + +[Source] +;IncludeInstallerSource=false + +[MainDirectories] +;RemoveAppDirectory=true +;RemoveOtherDirectory=true + +[OptionalComponents] +;OptionalComponents=true +;MainSectionTitle=AppName Portable (English) [Required] +;MainSectionDescription=Install the portable app +;OptionalSectionTitle=Additional Languages +;OptionalSectionDescription=Add multilingual support for this app +;OptionalSectionSelectedInstallType=Multilingual +;OptionalSectionNotSelectedInstallType=English +;OptionalSectionPreSelectedIfNonEnglishInstall=true +;OptionalSectionInstalledWhenSilent=true +;OptionalDirectory1= +;OptionalFile1= + +[CopyLocalFiles] +;CopyLocalFiles=true +;CopyFromRegPath=HKLM\Software\AppName +;CopyFromRegKey=AppPath +;CopyFromRegRemoveDirectories=2 +;CopyFromDirectory=%PROGRAMFILES%\AppName +;CopyToDirectory=App\AppName + +[DownloadFiles] +;AdditionalInstallSize= +;DownloadURL= +;DownloadKnockURL= +;DownloadName= +;DownloadFilename= +;DownloadMD5= +;DownloadTo= +;AdvancedExtract1To= +;AdvancedExtract1Filter= +;DoubleExtractFilename= +;DoubleExtract1To= +;DoubleExtract1Filter= +;Download2URL= +;Download2KnockURL= +;Download2Name= +;Download2Filename= +;Download2MD5= +;Download2To= +;Download2AdvancedExtract1To= +;Download2AdvancedExtract1Filter= +;Download2DoubleExtractFilename= +;Download2DoubleExtract1To= +;Download2DoubleExtract1Filter= +;CustomCodeUses7zip= + +[Languages] +;ENGLISH=true +;ENGLISHGB=true +;AFRIKAANS=true +;ALBANIAN=true +;ARABIC=true +;ARMENIAN=true +;BASQUE=true +;BELARUSIAN=true +;BOSNIAN=true +;BRETON=true +;BULGARIAN=true +;CATALAN=true +;CIBEMBA=true +;CROATIAN=true +;CZECH=true +;DANISH=true +;DUTCH=true +;EFIK=true +;ESPERANTO=true +;ESTONIAN=true +;FARSI=true +;FINNISH=true +;FRENCH=true +;GALICIAN=true +;GEORGIAN=true +;GERMAN=true +;GREEK=true +;HEBREW=true +;HUNGARIAN=true +;ICELANDIC=true +;IGBO=true +;INDONESIAN=true +;IRISH=true +;ITALIAN=true +;JAPANESE=true +;KHMER=true +;KOREAN=true +;KURDISH=true +;LATVIAN=true +;LITHUANIAN=true +;LUXEMBOURGISH=true +;MACEDONIAN=true +;MALAGASY=true +;MALAY=true +;MONGOLIAN=true +;NORWEGIAN=true +;NORWEGIANNYNORSK=true +;PASHTO=true +;POLISH=true +;PORTUGUESE=true +;PORTUGUESEBR=true +;ROMANIAN=true +;RUSSIAN=true +;SERBIAN=true +;SERBIANLATIN=true +;SIMPCHINESE=true +;SLOVAK=true +;SLOVENIAN=true +;SPANISH=true +;SPANISHINTERNATIONAL=true +;SWAHILI=true +;SWEDISH=true +;THAI=true +;TRADCHINESE=true +;TURKISH=true +;UKRAINIAN=true +;UZBEK=true +;VALENCIAN=true +;VIETNAMESE=true +;WELSH=true +;YORUBA=true + +[DirectoriesToPreserve] +;This indicates to the installer that these files will be preserved. We do this so that the fictitious portable configuration directory we handle in the example AppNamePortable.ini isn't lost if a crash and the upgrade occurs. +;PreserveDirectory1=App\AppName\Config + +[DirectoriesToRemove] +;RemoveDirectory1= + +[FilesToPreserve] +;This indicates to the installer that these files will be preserved. Wildcards are supported. We do this so that the fictitious portable configuration file we handle in the example AppNamePortable.ini isn't lost if a crash and the upgrade occurs. +;PreserveFile1=App\AppName\appnameportableexample.config + +[FilesToRemove] +;RemoveFile1= \ No newline at end of file diff --git a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini index 9b2e5d3e5..6f86c07b9 100644 Binary files a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini and b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini differ diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt new file mode 100644 index 000000000..6563189c5 --- /dev/null +++ b/np3portableapp/_buildname.txt @@ -0,0 +1 @@ +develop diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 51c384863..d0388b1b3 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -41,8 +41,11 @@ set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v141 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 + set NP3_BUILD_VER=%SCRIPT_DIR%..\Versions\build.txt +set NP3_BUILD_NAME=%SCRIPT_DIR%_buildname.txt :: -------------------------------------------------------------------------------------------------------------------- @@ -51,6 +54,7 @@ set MM=00 set DD=00 call :GETDATE set BUILD=0 +set DEVNAME= call :GETBUILD :: VERSION fallback from build date @@ -58,7 +62,6 @@ set VERSION=3.%YY%.%MM%%DD%.%BUILD% set FILEVER= call :GETFILEVER "%NP3_WIN32_DIR%\Notepad3.exe" - if defined FILEVER set VERSION=%FILEVER% ::echo.VERSION=%VERSION% @@ -86,7 +89,20 @@ copy /B "%NP3_X64_DIR%\ced.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\client.wyc" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\wyUpdate.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V -call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP3_PORTAPP_INFO%.ini" +call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP3_PORTAPP_INFO%_tmp.ini" + +:: DEVNAME need some mor PortableApps preparation, so set empty for now +set DEVNAME= + +if defined DEVNAME ( + call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "_%DEVNAME%" "%NP3_PORTAPP_INFO%.ini" + call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INSTALL%_template.ini" "_%DEVNAME%" "%NP3_PORTAPP_INSTALL%.ini" +) else ( + call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "" "%NP3_PORTAPP_INFO%.ini" + call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INSTALL%_template.ini" "" "%NP3_PORTAPP_INSTALL%.ini" +) + +del /F "%NP3_PORTAPP_INFO%_tmp.ini" :: -------------------------------------------------------------------------------------------------------------------- @@ -102,6 +118,8 @@ call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP "%PORTAPP_INSTALLER_CREATOR%" "%NP3_PORTAPP_DIR%" + + :: ==================================================================================================================== goto :END :: REPLACE strg(%1) srcfile(%2) replstrg(%3) dstfile(%4) @@ -148,6 +166,7 @@ goto:EOF :GETBUILD set /p nxbuild=<%NP3_BUILD_VER% set /a BUILD = %nxbuild% - 1 +set /p DEVNAME=<%NP3_BUILD_NAME% goto:EOF :: --------------------------------------------------------------------------------------------------------------------