diff --git a/.gitignore b/.gitignore index 43f742512..468371524 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,7 @@ Thumbs.db /src/VersionEx.h /minipath/src/VersionEx.h -/Version_*.cmd +#/Version_*.cmd /Versions/build.txt /np3portableapp/_buildname.txt diff --git a/Version.ps1 b/Version.ps1 index 6ee9474a9..2b3c92c88 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -49,9 +49,9 @@ try if (!$OnigmoVer) { $OnigmoVer = "0.0.0" } $CompleteVer = "$Major.$Minor.$Revis.$Build" - DebugOutput("Version number: '$VerPatch v$CompleteVer'") + DebugOutput("Version number: 'v$CompleteVer $VerPatch'") -if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string +#~if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "src\VersionEx.h" diff --git a/Version_PAPPS.cmd b/Version_PAPPS.cmd new file mode 100644 index 000000000..9a5bed708 --- /dev/null +++ b/Version_PAPPS.cmd @@ -0,0 +1,6 @@ +@echo off +setlocal +set _VERPATCH_=Dev_Test_1 +echo "%_VERPATCH_%" > .\np3portableapp\_buildname.txt +Version -VerPatch "%_VERPATCH_%" +endlocal diff --git a/Version_RC.cmd b/Version_RC.cmd index ac0908092..67dfcbeac 100644 --- a/Version_RC.cmd +++ b/Version_RC.cmd @@ -1,6 +1,6 @@ @echo off setlocal set _VERPATCH_=RC -echo.%_VERPATCH_%> .\np3portableapp\_buildname.txt +echo."%_VERPATCH_%" > .\np3portableapp\_buildname.txt Version -VerPatch "%_VERPATCH_%" endlocal diff --git a/Version_develop.cmd b/Version_develop.cmd index 8a8705963..d7dd899cb 100644 --- a/Version_develop.cmd +++ b/Version_develop.cmd @@ -1,6 +1,6 @@ @echo off setlocal set _VERPATCH_=develop -echo.%_VERPATCH_%> .\np3portableapp\_buildname.txt +echo."%_VERPATCH_%" > .\np3portableapp\_buildname.txt Version -VerPatch "%_VERPATCH_%" endlocal diff --git a/Versions/build.txt b/Versions/build.txt index a2f103a07..ede42cd0f 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1434 +1436 diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Splash.jpg b/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Splash.jpg new file mode 100644 index 000000000..81be6a90a Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Splash.jpg differ diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini index d26d84804..8a0e9daff 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini @@ -5,28 +5,40 @@ Version=3.5 [Details] Name=Notepad3PortablexxxDEVNAMExxx -AppId=Notepad3PortablexxxDEVNAMExxx +AppId=Notepad3Portable +BaseAppName=Notepad3 Publisher=Notepad3 Contibutors & Rizonesoft & PortableApps.com -Homepage=https://rizonesoft.com +Homepage=PortableApps.com/Notepad3Portable Category=Development Description=A lightweight universal Texteditor -Language=English +Language=Multilingual +;Trademarks='thing' is a trademark of XYZ Inc +;InstallType= [License] Shareable=true OpenSource=true Freeware=true CommercialUse=true - -[Dependencies] +;EULAVersion=1 [Version] PackageVersion=xxxVERSIONxxx -DisplayVersion=xxxVERSIONxxx +DisplayVersion=xxxVERSIONxxx_xxxDEVNAMExxx + +[SpecialPaths] +Plugins=NONE + +[Dependencies] +UsesJava=no +;UsesDotNetVersion= [Control] Icons=1 Start=Notepad3Portable.exe +;ExtractIcon=App\Notepad3\x86\Notepad3.exe +;ExtractName=App\Notepad3\x86\Notepad3.exe +;BaseAppID=%BASELAUNCHERPATH%\App\Notepad3\x86\Notepad3.exe [Associations] FileTypes=txt,html,htm,xmp,php,asp,css,js,vb,vbs,c,cpp,h,rs,mak,java,pas,inc,bat,diff,ps1,ahk,au3,avs,cmake,iss,latex,lua,nsi,nsh,nfo,tcl,rb @@ -40,4 +52,7 @@ FileTypes=txt,html,htm,xmp,php,asp,css,js,vb,vbs,c,cpp,h,rs,mak,java,pas,inc,bat ;Shell=true ;ShellCommand=/idlist,%I,%L -;[FileTypeIcons] +[FileTypeIcons] +;swf=video +;ttp=custom +;qwe=app diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini index 5597416b5..7e6ea7652 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini @@ -1,6 +1,10 @@ [CheckRunning] [Source] +IncludeInstallerSource=false [MainDirectories] +RemoveAppDirectory=true +RemoveDataDirectory=false +RemoveOtherDirectory=true [OptionalComponents] [CopyLocalFiles] [DownloadFiles] @@ -8,8 +12,13 @@ ENGLISH=true ENGLISHGB=true AFRIKAANS=true +BELARUSIAN=true +DUTCH=true FRENCH=true GERMAN=true +JAPANESE=true +RUSSIAN=true +SIMPCHINESE=true [DirectoriesToPreserve] [DirectoriesToRemove] [FilesToPreserve] diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini index fda147e31..bca6ec811 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini @@ -12,14 +12,15 @@ ;CloseName=AppName [Source] -;IncludeInstallerSource=false +IncludeInstallerSource=false [MainDirectories] -;RemoveAppDirectory=true -;RemoveOtherDirectory=true +RemoveAppDirectory=true +RemoveDataDirectory=false +RemoveOtherDirectory=true [OptionalComponents] -;OptionalComponents=true +;OptionalComponents=false ;MainSectionTitle=AppName Portable (English) [Required] ;MainSectionDescription=Install the portable app ;OptionalSectionTitle=Additional Languages @@ -73,7 +74,7 @@ AFRIKAANS=true ;ARABIC=true ;ARMENIAN=true ;BASQUE=true -;BELARUSIAN=true +BELARUSIAN=true ;BOSNIAN=true ;BRETON=true ;BULGARIAN=true @@ -82,7 +83,7 @@ AFRIKAANS=true ;CROATIAN=true ;CZECH=true ;DANISH=true -;DUTCH=true +DUTCH=true ;EFIK=true ;ESPERANTO=true ;ESTONIAN=true @@ -100,7 +101,7 @@ GERMAN=true ;INDONESIAN=true ;IRISH=true ;ITALIAN=true -;JAPANESE=true +JAPANESE=true ;KHMER=true ;KOREAN=true ;KURDISH=true @@ -118,13 +119,13 @@ GERMAN=true ;PORTUGUESE=true ;PORTUGUESEBR=true ;ROMANIAN=true -;RUSSIAN=true +RUSSIAN=true ;SERBIAN=true ;SERBIANLATIN=true -;SIMPCHINESE=true +SIMPCHINESE=true ;SLOVAK=true ;SLOVENIAN=true -;SPANISH=true +SPANISH=true ;SPANISHINTERNATIONAL=true ;SWAHILI=true ;SWEDISH=true diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi index ec9929919..324e83737 100644 --- a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi +++ b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi @@ -1,6 +1,6 @@ ;Copyright 2004-2016 John T. Haller of PortableApps.com -;Website: http://PortableApps.com/FirefoxPortable +;Website: http://PortableApps.com/Notepad3Portable ;This software is OSI Certified Open Source Software. ;OSI Certified is a certification mark of the Open Source Initiative. @@ -19,21 +19,32 @@ ;along with this program; if not, write to the Free Software ;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +!define PORTABLEAPPNAME "Notepad3, Portable Edition" +!define NamePortable "Notepad3, Portable Edition" +!define APPNAME "Notepad3" +!define NAME "Notepad3Portable" +!define AppID "Notepad3Portable" +!define VER "5.18.1108.1350" +!define WEBSITE "PortableApps.com/Notepad3Portable" +!define DEFAULTEXE "Notepad3.exe" +!define DEFAULTAPPDIR "Notepad3" +!define LAUNCHERLANGUAGE "English" + ;=== Program Details -Name "Notepad3" -OutFile "Notepad3.exe" -Caption "Notepad3 | PortableApps.com" -VIProductVersion "4.18.516.992" -VIAddVersionKey ProductName "Notepad3" +Name "${PORTABLEAPPNAME}" +OutFile "${DEFAULTEXE}" +Caption "${PORTABLEAPPNAME} | PortableApps.com" +VIProductVersion "${VER}" +VIAddVersionKey ProductName "${PORTABLEAPPNAME}" VIAddVersionKey Comments "A notepad replacement" VIAddVersionKey CompanyName "Rizonesoft" VIAddVersionKey LegalCopyright "Derick Payne" VIAddVersionKey FileDescription "Based on code from Notepad2, ® Florian Balmer 1996-2011" -VIAddVersionKey FileVersion "4.18.516.992" -VIAddVersionKey ProductVersion "4.18.516.992" -VIAddVersionKey InternalName "Notepad3" +VIAddVersionKey FileVersion "${VER}" +VIAddVersionKey ProductVersion "${VER}" +VIAddVersionKey InternalName "${PORTABLEAPPNAME}" VIAddVersionKey LegalTrademarks "Rizonesoft® 2008-2018" -VIAddVersionKey OriginalFilename "Notepad3.exe" +VIAddVersionKey OriginalFilename "${DEFAULTEXE}" ;VIAddVersionKey PrivateBuild "" ;VIAddVersionKey SpecialBuild "" @@ -44,6 +55,7 @@ SilentInstall Silent AutoCloseWindow True RequestExecutionLevel user XPStyle on +Unicode true ; Best Compression SetCompress Auto @@ -51,6 +63,9 @@ SetCompressor /SOLID lzma SetCompressorDictSize 32 SetDatablockOptimize On +;=== Include +;(Standard NSIS) + ;=== Program Icon Icon "..\..\App\AppInfo\appicon.ico" @@ -58,7 +73,8 @@ Icon "..\..\App\AppInfo\appicon.ico" BrandingText "Rizonesoft®" ;=== Languages -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LAUNCHERLANGUAGE}.nlf" +!include PortableApps.comLauncherLANG_${LAUNCHERLANGUAGE}.nsh Section "Main" MessageBox MB_OK|MB_ICONINFORMATION "Notepad3.exe is running and will close when you click OK." diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.ini b/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.ini index b52720574..585cd88b7 100644 --- a/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.ini +++ b/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.ini @@ -1,5 +1,5 @@ AdditionalParameters= -DisableSplashScreen=true +DisableSplashScreen=false RunLocally=false # The above options are explained in the included readme.txt diff --git a/np3portableapp/Notepad3Portable/help.html b/np3portableapp/Notepad3Portable/help.html index cf7ce5359..6c0e18d09 100644 --- a/np3portableapp/Notepad3Portable/help.html +++ b/np3portableapp/Notepad3Portable/help.html @@ -5,7 +5,7 @@ **App Name** Portable Help - +