+ chg: preparations for PortableApps.com distribution

.gitignore

@@ -49,7 +49,7 @@ Thumbs.db
 /src/VersionEx.h
 /minipath/src/VersionEx.h
 
-/Version_*.cmd
+#/Version_*.cmd
 /Versions/build.txt
 /np3portableapp/_buildname.txt
 

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"

Version_PAPPS.cmd

@@ -0,0 +1,6 @@
+@echo off
+setlocal
+set _VERPATCH_=Dev_Test_1
+echo "%_VERPATCH_%" > .\np3portableapp\_buildname.txt
+Version -VerPatch "%_VERPATCH_%"
+endlocal

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

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

Versions/build.txt

@@ -1 +1 @@
-1434
+1436

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

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]

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

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."

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

np3portableapp/Notepad3Portable/help.html

@@ -5,7 +5,7 @@
 <head>
 <meta charset="UTF-8">
 <title>**App Name** Portable Help</title>
-<link rel="alternate" href="http://portableapps.com/feeds/general" type="application/rss+xml" title="PortableApps.com">
+<link rel="alternate" href="https://portableapps.com/feeds/general" type="application/rss+xml" title="PortableApps.com">
 <link rel="shortcut icon" href="Other/Help/Images/Favicon.ico">
 <style type="text/css">
 	body {
@@ -125,21 +125,21 @@
 </head>
 
 <body>
-<div class="logo"><a href="http://portableapps.com/"><img src="Other/Help/Images/Help_Logo_Top.png" alt="PortableApps.com - Your Digital Life, Anywhere"></a></div>
+<div class="logo"><a href="https://portableapps.com/"><img src="Other/Help/Images/Help_Logo_Top.png" alt="PortableApps.com - Your Digital Life, Anywhere"></a></div>
 <div class="content">
 <h1 class="hastagline">**App Name** Portable Help</h1>
 
 <h2 class="tagline">**insert catchy tag line**</h2>
 
-<p>**App Name** Portable is [DESCRIPTION OF APP FUNCTION HERE]. It's packaged with a PortableApps.com launcher as a <a href="http://portableapps.com/about/what_is_a_portable_app">portable app</a>, so you can use it from a cloud folder, portable drive, or local folder without needing to install it on each PC. <a href="http://**appname.com**">Learn more about **App Name**...</a></p>
+<p><img src="App\AppInfo\appicon_128.png" width="128" height="128" style="float:right;">**App Name** Portable is [DESCRIPTION OF APP FUNCTION HERE]. It's packaged with a PortableApps.com launcher as a <a href="https://portableapps.com/about/what_is_a_portable_app">portable app</a>, so you can use it from a cloud folder, portable drive, or local folder without needing to install it on each PC. <a href="http://example.com/">Learn more about **App Name**...</a></p>
 
-<p><a href="http://portableapps.com/donate"><img src="Other/Help/Images/Donation_Button.png" style="vertical-align:middle" alt="Make a Donation"></a> - Support PortableApps.com's Hosting and Development</p>
+<p><a href="https://portableapps.com/donate"><img src="Other/Help/Images/Donation_Button.png" style="vertical-align:middle" alt="Make a Donation"></a> - Support PortableApps.com's Hosting and Development</p>
 
 <!-- While a development test, have the next link go to the node in the forums. Once released, change this link to the app's homepage in the directory -->
 
-<p><a href="http://portableapps.com/node/*Node ID*">Go to the **App Name** Portable Homepage &gt;&gt;</a></p>
+<p><a href="https://portableapps.com/node/*Node ID*">Go to the **App Name** Portable Homepage &gt;&gt;</a></p>
 
-<p><a href="http://portableapps.com/">Get more portable apps at PortableApps.com</a></p>
+<p><a href="https://portableapps.com/">Get more portable apps at PortableApps.com</a></p>
 
 <!-- If the software being packaged is open source under an OSI approved license, keep the first partagraph and delete the second paragraph below.  If the software being packaged is freeware or not OSI certified, keep the second paragrah and delete the first paragraph below. -->
 
@@ -149,10 +149,10 @@
 
 <h2>Portable App Issues</h2>
 <ul>
-	<li><a href="http://portableapps.com/support/portable_app#downloading">Downloading a Portable App</a></li>
-	<li><a href="http://portableapps.com/support/portable_app#installing">Installing a Portable App</a></li>
-	<li><a href="http://portableapps.com/support/portable_app#using">Using a Portable App</a></li>
-	<li><a href="http://portableapps.com/support/portable_app#upgrading">Upgrading a Portable App</a></li>
+	<li><a href="https://portableapps.com/support/portable_app#downloading">Downloading a Portable App</a></li>
+	<li><a href="https://portableapps.com/support/portable_app#installing">Installing a Portable App</a></li>
+	<li><a href="https://portableapps.com/support/portable_app#using">Using a Portable App</a></li>
+	<li><a href="https://portableapps.com/support/portable_app#upgrading">Upgrading a Portable App</a></li>
 </ul>
 <p>You can read about advanced configuration options for the PortableApps.com Launcher in its <a href="Other/Source/Readme.txt">readme file</a>.</p>
 </div>

np3portableapp/_buildname.txt

@@ -1 +1 @@
-RC
+"Dev_Test_1" 

np3portableapp/build_np3portableapp.cmd

@@ -28,6 +28,10 @@ setlocal enableextensions
 
 :: ====================================================================================================================
 
+set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR ja-JP nl-NL ru-RU zh-CN
+
+:: ====================================================================================================================
+
 :: --- Environment ---
 set SCRIPT_DIR=%~dp0
 set PORTAPP_ROOT_DIR=D:\PortableApps
@@ -35,8 +39,6 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab
 set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
 set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
 
-set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR ja-JP nl-NL ru-RU zh-CN
-
 set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
 set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141
 set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v141
@@ -45,7 +47,6 @@ 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
 
@@ -114,7 +115,7 @@ call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP
 :: DEVNAME need some more PortableApps preparation
 ::~  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"
-call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "" "%NP3_PORTAPP_INFO%.ini"
+call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "%DEVNAME%" "%NP3_PORTAPP_INFO%.ini"
 call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INSTALL%_template.ini" "" "%NP3_PORTAPP_INSTALL%.ini"
 
 del /F "%NP3_PORTAPP_INFO%_tmp.ini"
@@ -133,7 +134,7 @@ del /F "%NP3_PORTAPP_INFO%_tmp.ini"
 "%PORTAPP_INSTALLER_CREATOR%" "%NP3_PORTAPP_DIR%"
 
 :: rename
-rename "%SCRIPT_DIR%Notepad3Portable_%VERSION%_English.paf.exe" "Notepad3Portable_%DEVNAME%_%VERSION%_English.paf.exe"
+rename "%SCRIPT_DIR%Notepad3Portable_%VERSION%.paf.exe" "Notepad3Portable_%VERSION%_%DEVNAME%.paf.exe"
 
 :: ====================================================================================================================
 goto :END
@@ -181,6 +182,7 @@ goto:EOF
 set /p nxbuild=<%NP3_BUILD_VER%
 set /a BUILD = %nxbuild% - 1
 set /p DEVNAME=<%NP3_BUILD_NAME%
+set DEVNAME=%DEVNAME:"=%
 goto:EOF
 :: --------------------------------------------------------------------------------------------------------------------
 

res/Notepad3.exe.manifest.conf

@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.18.1106.1434"
+    version="5.18.1108.1436"
     type="win32"
   />
-  <description>Notepad3  RC</description>
+  <description>Notepad3 Dev_Test_1</description>
 </assembly>

src/VersionEx.h

@@ -6,8 +6,8 @@
 #define APPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 18
-#define VERSION_REV 1106
-#define VERSION_BUILD 1434
+#define VERSION_REV 1108
+#define VERSION_BUILD 1436
 #define SCINTILLA_VER 412
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH " RC"
+#define VERSION_PATCH "Dev_Test_1"