Skip to content

Commit

Permalink
v0.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
dail8859 committed Apr 11, 2021
2 parents 322480e + ff468a5 commit 8bcfc93
Show file tree
Hide file tree
Showing 538 changed files with 10,341 additions and 47,880 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
submodules: true

- name: Install Qt
uses: jurplel/install-qt-action@v2.11.1
uses: jurplel/install-qt-action@v2

- name: Setup VS tools
uses: egor-tensin/vs-shell@v2
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[submodule "src/singleapplication"]
path = src/singleapplication
url = https://github.com/itay-grudev/SingleApplication.git
[submodule "src/uchardet"]
path = src/uchardet
url = https://gitlab.freedesktop.org/uchardet/uchardet.git
[submodule "src/editorconfig-core-qt"]
path = src/editorconfig-core-qt
url = https://github.com/editorconfig/editorconfig-core-qt.git
[submodule "src/ads"]
path = src/ads
url = https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
9 changes: 4 additions & 5 deletions doc/Create Release.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
## Prepare Release

1. Update version in `appveyor.yml`
2. Update version in `installer/config/config.xml`
3. Update version and date in `installer/packages/app/meta/package.xml`
4. Update version in `src/Version.pri`
1. Update version in `installer/config/config.xml`
2. Update version and date in `installer/packages/app/meta/package.xml`
3. Update version in `src/Version.pri`

## Build Release
Example bat script to build release

```
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
set PATH=C:\Qt\5.15.1\msvc2019_64\bin\;C:\Qt\Tools\QtCreator\bin\;%PATH%
set PATH=C:\Qt\5.15.2\msvc2019_64\bin\;C:\Qt\Tools\QtCreator\bin\;%PATH%
mkdir build
cd build
qmake ..\src\NotepadNext.pro
Expand Down
4 changes: 2 additions & 2 deletions installer/config/config.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>Notepad Next</Name>
<Version>0.3.3</Version>
<Title>Notepad Next v0.3.3</Title>
<Version>0.4</Version>
<Title>Notepad Next v0.4</Title>
<Publisher>Notepad Next</Publisher>
<StartMenuDir>Notepad Next</StartMenuDir>

Expand Down
2 changes: 1 addition & 1 deletion installer/installer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ INPUT = config/config.xml \
installer.input = INPUT
installer.output = $$INSTALLER
installer.CONFIG += target_predeps no_link combine
installer.commands = C:/Qt/Tools/QtInstallerFramework/3.2/bin/binarycreator --offline-only -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT}
installer.commands = C:/Qt/Tools/QtInstallerFramework/4.0/bin/binarycreator --offline-only -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT}

QMAKE_EXTRA_COMPILERS += installer

Expand Down
6 changes: 3 additions & 3 deletions installer/packages/app/meta/package.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<Package>
<DisplayName>Notepad Next</DisplayName>
<Description>Notepad Next v0.3.3</Description>
<Version>0.3.3</Version>
<Description>Notepad Next v0.4</Description>
<Version>0.4</Version>
<ForcedInstallation>true</ForcedInstallation>
<ReleaseDate>2020-09-08</ReleaseDate>
<ReleaseDate>2021-04-11</ReleaseDate>
<!-- <RequiresAdminRights>true</RequiresAdminRights> -->
<Script>installscript.qs</Script>
<UserInterfaces>
Expand Down
5 changes: 1 addition & 4 deletions src/NotepadNext.pro
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@ lessThan(QT_MAJOR_VERSION, 5) {
TEMPLATE = subdirs

SUBDIRS = ScintillaEdit \
lua \
uchardet \
ads \
NotepadNext

ScintillaEdit.subdir = scintilla/qt/ScintillaEdit

NotepadNext.depends = ScintillaEdit lua uchardet ads
NotepadNext.depends = ScintillaEdit

win32 {
package.target = make_package
Expand Down
195 changes: 0 additions & 195 deletions src/NotepadNext/BufferManager.cpp

This file was deleted.

80 changes: 0 additions & 80 deletions src/NotepadNext/BufferManager.h

This file was deleted.

Loading

0 comments on commit 8bcfc93

Please sign in to comment.