Skip to content

Commit 316e1ab

Browse files
authored
Merge pull request #251 from Dn-Programming-Core-Management/docs-license-ver-meta-dev
Release Version 0.5.0.2
2 parents 1758e10 + 29bda13 commit 316e1ab

File tree

346 files changed

+425
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+425
-364
lines changed

.github/workflows/build-artifact.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
platform: [x64, Win32]
1111
configuration: [Release, Debug, ASAN-Release, ASAN-Debug]
1212
steps:
13-
- uses: actions/checkout@master
13+
- uses: actions/checkout@v4
1414
with:
1515
submodules: "recursive"
1616
fetch-depth: 0
@@ -28,7 +28,7 @@ jobs:
2828
if %ERRORLEVEL%==1 exit %ERRORLEVEL%
2929
call release.bat ${{ matrix.configuration }} ${{ matrix.platform }} ${{ env.commithash }}_${{ github.run_id }}
3030
- name: Upload binaries
31-
uses: actions/upload-artifact@master
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: Dn-FamiTracker_${{ env.commithash }}_${{ github.run_id }}_${{ matrix.platform }}_${{ matrix.configuration }}
3434
path: distribute/*_${{ matrix.platform }}_${{ matrix.configuration }}.7z

.github/workflows/build-release-artifact.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
tags:
55
- "*"
6+
env:
7+
commithash: ""
68
jobs:
79
build-matrix-publish:
810
runs-on: windows-2022
@@ -11,13 +13,16 @@ jobs:
1113
platform: [x64, Win32]
1214
# configuration is Release only
1315
steps:
14-
- uses: actions/checkout@master
16+
- uses: actions/checkout@v4
1517
with:
1618
submodules: "recursive"
1719
fetch-depth: 0
1820
- uses: r-lib/actions/setup-pandoc@v2
1921
with:
2022
pandoc-version: '3.1.8'
23+
- name: Set commit hash variable
24+
shell: powershell
25+
run: echo "commithash=$(git describe --tags)" >> $env:GITHUB_ENV
2126
- name: Build program
2227
shell: cmd
2328
run: |
@@ -26,22 +31,27 @@ jobs:
2631
if %ERRORLEVEL%==1 exit %ERRORLEVEL%
2732
call release.bat Release ${{ matrix.platform }}
2833
- name: Upload binaries
29-
uses: actions/upload-artifact@master
34+
uses: actions/upload-artifact@v4
3035
with:
36+
name: Dn-FamiTracker_${{ env.commithash }}_${{ github.run_id }}_${{ matrix.platform }}
3137
path: distribute/*_${{ matrix.platform }}_Release.7z
3238
publish-build:
3339
needs: build-matrix-publish
3440
runs-on: windows-2022
3541
steps:
36-
- uses: actions/download-artifact@master
3742
- name: Download binaries
38-
shell: powershell
39-
run: ls -R
43+
uses: actions/download-artifact@v4
44+
with:
45+
path: Dn-FamiTracker_artifacts
46+
pattern: Dn-FamiTracker_*
47+
merge-multiple: true
48+
shell: powershell
49+
- run: ls -R
4050
- name: Upload release
41-
uses: marvinpinto/action-automatic-releases@master
51+
uses: marvinpinto/action-automatic-releases@v1.2.1
4252
with:
4353
repo_token: "${{ secrets.GITHUB_TOKEN }}"
4454
draft: true
4555
prerelease: false
4656
automatic_release_tag: draft
47-
files: artifact/*.7z
57+
files: Dn-FamiTracker_artifacts/*.7z

Dn-FamiTracker.rc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ END
535535
//
536536

537537
VS_VERSION_INFO VERSIONINFO
538-
FILEVERSION 0,5,0,1
539-
PRODUCTVERSION 0,5,0,1
538+
FILEVERSION 0,5,0,2
539+
PRODUCTVERSION 0,5,0,2
540540
FILEFLAGSMASK 0x3fL
541541
#ifdef _DEBUG
542542
FILEFLAGS 0x1L
@@ -553,12 +553,12 @@ BEGIN
553553
BEGIN
554554
VALUE "CompanyName", "Dn Programming Core Management"
555555
VALUE "FileDescription", "Dn-FamiTracker, Extension of FamiTracker"
556-
VALUE "FileVersion", "0.5.0.1"
556+
VALUE "FileVersion", "0.5.0.2"
557557
VALUE "InternalName", "Dn-FamiTracker.exe"
558-
VALUE "LegalCopyright", "(c) jsr 2005-2020, HertzDevil 2014-2018, Dn Programming Core Management 2020-2023. All rights reserved."
558+
VALUE "LegalCopyright", "(c) jsr 2005-2020, HertzDevil 2014-2018, Dn Programming Core Management 2020-2024. All rights reserved."
559559
VALUE "OriginalFilename", "Dn-FamiTracker.exe"
560560
VALUE "ProductName", "Dn-FamiTracker"
561-
VALUE "ProductVersion", "0.5.0.1"
561+
VALUE "ProductVersion", "0.5.0.2"
562562
END
563563
END
564564
BLOCK "VarFileInfo"
@@ -1105,7 +1105,7 @@ BEGIN
11051105
ICON IDR_MAINFRAME,IDC_ICON_STATIC,11,58,20,20,SS_REALSIZEIMAGE
11061106
LTEXT "Dn-FamiTracker",IDC_ABOUT1,54,58,219,11,SS_NOPREFIX
11071107
LTEXT "Extension of 0CC-FamiTracker",IDC_ABOUT2,54,72,167,8,SS_NOPREFIX
1108-
LTEXT "Copyright (C) 2005 - 2020 jsr, 2014 - 2018 HertzDevil,\n2020 - 2023 Dn Programming Core Management.",IDC_ABOUT3,54,84,215,16
1108+
LTEXT "Copyright (C) 2005 - 2020 jsr, 2014 - 2018 HertzDevil,\n2020 - 2024 Dn Programming Core Management.",IDC_ABOUT3,54,84,215,16
11091109
LTEXT "Web:",IDC_STATIC,54,107,24,9
11101110
LTEXT "Dn-FamiTracker issue tracker",IDC_BUG,84,134,194,9,SS_NOTIFY
11111111
LTEXT "All comments and feedback are welcome\nGreets to everyone who has helped spread information about this mod or contributed with bug reports and suggestions!",IDC_STATIC,54,150,224,26

Dn-help

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The texts for the MIT-0 and GPL v2 licenses are listed below:
2222

2323
MIT No Attribution
2424

25-
Copyright 2022 D.P.C.M.
25+
Copyright 2024 D.P.C.M.
2626

2727
Permission is hereby granted, free of charge, to any person obtaining a copy of
2828
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,15 @@ Notice: Due to delayed Appveyor reintegration, builds for commits `dc4c9e8` to `
3232

3333
Notice: Due to delayed branch renaming, builds for commits `bc46c86` to `a591d15` are not available.
3434

35-
## License
35+
## Licenses
3636

37-
The application and the source code are distributed under the GNU GPL 2 license or any later version, but depends on FDS and N163 sound emulation only under the GPL v3. The original NSF driver source code is unlicensed. 0CC FT NSF driver changes are licensed under GPL v2. Dn-FT NSF driver changes are licensed under MIT-0.
37+
The application and the source code are distributed under the GNU GPL 2 license or any later version, but depends on FDS and N163 sound emulation only under the GPL v3.
38+
39+
The original NSF driver source code is unlicensed.
40+
41+
0CC FT NSF driver changes are licensed under GPL v2.
42+
43+
Dn-FT NSF driver changes are licensed under MIT-0.
3844

3945
## See also:
4046

Source/APU/2A03.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
**
55
** 0CC-FamiTracker is (C) 2014-2018 HertzDevil
66
**
7-
** Dn-FamiTracker is (C) 2020-2023 D.P.C.M.
7+
** Dn-FamiTracker is (C) 2020-2024 D.P.C.M.
88
**
99
** This program is free software; you can redistribute it and/or modify
1010
** it under the terms of the GNU General Public License as published by

Source/APU/2A03.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
**
55
** 0CC-FamiTracker is (C) 2014-2018 HertzDevil
66
**
7-
** Dn-FamiTracker is (C) 2020-2023 D.P.C.M.
7+
** Dn-FamiTracker is (C) 2020-2024 D.P.C.M.
88
**
99
** This program is free software; you can redistribute it and/or modify
1010
** it under the terms of the GNU General Public License as published by

Source/APU/2A03Chan.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
**
55
** 0CC-FamiTracker is (C) 2014-2018 HertzDevil
66
**
7-
** Dn-FamiTracker is (C) 2020-2023 D.P.C.M.
7+
** Dn-FamiTracker is (C) 2020-2024 D.P.C.M.
88
**
99
** This program is free software; you can redistribute it and/or modify
1010
** it under the terms of the GNU General Public License as published by

Source/APU/APU.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
**
55
** 0CC-FamiTracker is (C) 2014-2018 HertzDevil
66
**
7-
** Dn-FamiTracker is (C) 2020-2023 D.P.C.M.
7+
** Dn-FamiTracker is (C) 2020-2024 D.P.C.M.
88
**
99
** This program is free software; you can redistribute it and/or modify
1010
** it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)