CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ enh: PortableApps dev

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-11-08 16:10:36 +01:00
parent 8382a0097b
commit ddfe313402
13 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Version.ps1
View File

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

2
Version_RC.cmd
View File

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

2
Version_develop.cmd
View File

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

2
Versions/build.txt
View File

@ -1 +1 @@
1434
1440

29
np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
View File

@ -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

10
np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
View File

@ -1,20 +1,24 @@
[CheckRunning]
[Source]
IncludeInstallerSource=false
[MainDirectories]
RemoveAppDirectory=true
RemoveDataDirectory=false
RemoveOtherDirectory=true
[OptionalComponents]
[CopyLocalFiles]
[DownloadFiles]
[Languages]
ENGLISH=true
AFRIKAANS=true
DUTCH=true
ENGLISHGB=true
AFRIKAANS=true
BELARUSIAN=true
DUTCH=true
FRENCH=true
GERMAN=true
JAPANESE=true
RUSSIAN=true
SIMPCHINESE=true
SPANISH=true
[DirectoriesToPreserve]
[DirectoriesToRemove]
[FilesToPreserve]

9
np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
View File

@ -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

2
np3portableapp/_buildname.txt
View File

@ -1 +1 @@
RC
"Dev_Test_1"

5
np3portableapp/build_np3portableapp.cmd
View File

@ -115,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"
@ -134,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
@ -182,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
:: --------------------------------------------------------------------------------------------------------------------

4
res/Notepad3.exe.manifest.conf
View File

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

2
src/Notepad3.c
View File

@ -6816,7 +6816,7 @@ void LoadSettings()
GET_BOOL_VALUE_FROM_INISECTION(BackspaceUnindents, false);
GET_INT_VALUE_FROM_INISECTION(TabWidth, 4, 1, 1024); Globals.iTabWidth = Settings.TabWidth;
GET_INT_VALUE_FROM_INISECTION(IndentWidth, 4, 0, 1024); Globals.iIndentWidth = Settings.IndentWidth;
GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, true);
GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, false);
GET_BOOL_VALUE_FROM_INISECTION(MarkLongLines, true);
GET_INT_VALUE_FROM_INISECTION(LongLinesLimit, 80, 0, LONG_LINES_MARKER_LIMIT); Globals.iLongLinesLimit = Settings.LongLinesLimit;
GET_INT_VALUE_FROM_INISECTION(LongLineMode, EDGE_LINE, EDGE_LINE, EDGE_BACKGROUND);

BIN
src/Version.h
View File

Binary file not shown.

6
src/VersionEx.h
View File

@ -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 1440
#define SCINTILLA_VER 412
#define ONIGMO_REGEX_VER 6.1.3
#define VERSION_PATCH " RC"
#define VERSION_PATCH "Dev_Test_1"