Skip to content

Commit e0298b4

Browse files
dep5dep5
committed
conflict修正
2 parents da66fa3 + cf4763b commit e0298b4

File tree

937 files changed

+4065
-2790
lines changed

Some content is hidden

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

937 files changed

+4065
-2790
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
*.kwd text
22
*.khp text
33
*.hkn text
4-
*.bat text
4+
*.bat text eol=crlf
55
Makefile text eol=lf
66
sakura_rc.h text eol=crlf
77
*.rc text working-tree-encoding=utf-16le-bom eol=crlf

‎.github/workflows/build-sakura.yml

+27-11
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@ name: build sakura
33
# Controls when the action will run. Triggers the workflow on push or pull request
44
# events but only for the master branch
55
on:
6+
workflow_dispatch:
67
push:
7-
branches:
8-
- master
9-
- feature/*
108
paths-ignore:
119
- '**/*.md'
1210
- .gitignore
1311
- .editorconfig
1412
- appveyor.yml
1513
- 'azure-pipelines*.yml'
1614
- 'ci/azure-pipelines/template*.yml'
17-
1815
pull_request:
19-
branches:
20-
- master
21-
- feature/*
22-
- release/*
2316
paths-ignore:
2417
- '**/*.md'
2518
- .gitignore
@@ -34,10 +27,13 @@ jobs:
3427
build:
3528
# The type of runner that the job will run on
3629
name: MSBuild
37-
runs-on: windows-latest
30+
runs-on: ${{matrix.os}}
3831

3932
strategy:
4033
matrix:
34+
os:
35+
- windows-2019
36+
- windows-2022
4137
config:
4238
- Debug
4339
- Release
@@ -89,14 +85,34 @@ jobs:
8985
run: build-sln.bat ${{ matrix.platform }} ${{ matrix.config }}
9086
shell: cmd
9187

88+
- name: Run unit tests
89+
run: .\tests1.exe --gtest_output=xml:${{github.workspace}}\tests1.exe-googletest-${{matrix.platform}}-${{matrix.config}}.xml
90+
working-directory: ${{github.workspace}}\${{matrix.platform}}\${{matrix.config}}
91+
shell: pwsh
92+
9293
- name: Install Locale Emulator
93-
run: choco install locale-emulator -y
94-
shell: cmd
94+
run: |
95+
choco install autohotkey.install --confirm
96+
$LEExpandDir = "${{github.workspace}}\tools\locale-emulator"
97+
$LEInitScript = "${{github.workspace}}\ci\init-locale-emulator.ahk"
98+
New-Item "${LEExpandDir}" -ItemType Directory
99+
Invoke-WebRequest `
100+
"https://github.com/xupefei/Locale-Emulator/releases/download/v2.5.0.1/Locale.Emulator.2.5.0.1.zip" `
101+
-OutFile "${LEExpandDir}\locale-emulator.zip"
102+
Expand-Archive "${LEExpandDir}\locale-emulator.zip" "${LEExpandDir}"
103+
Start-Process "AutoHotKey" "${LEInitScript}"
104+
Start-Process "${LEExpandDir}\LEInstaller.exe"
105+
echo "${LEExpandDir}" >> $env:GITHUB_PATH
106+
shell: pwsh
95107

96108
- name: Build HTML Help
97109
run: build-chm.bat
98110
shell: cmd
99111

112+
- name: Update/Install Inno Setup
113+
run: choco upgrade innosetup --confirm
114+
shell: pwsh
115+
100116
- name: Build installer with Inno Setup
101117
run: build-installer.bat ${{ matrix.platform }} ${{ matrix.config }}
102118
shell: cmd

‎.github/workflows/sonarscan.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: SonarCloud
33
# Controls when the action will run. Triggers the workflow on push or pull request
44
# events but only for the master branch
55
on:
6+
workflow_dispatch:
67
push:
78
paths-ignore:
89
- '**/*.md'
@@ -146,6 +147,7 @@ jobs:
146147
-D"sonar.cfamily.cache.path=.sonar\analysis-cache" `
147148
-D"sonar.cfamily.cppunit.reportPath=tests1-googletest.xml" `
148149
-D"sonar.cfamily.threads=2" `
149-
-D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tools\**\*.js" `
150+
-D"sonar.python.version=3" `
151+
-D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tests\stubs\**\*.cpp,tools\**\*.js" `
150152
-D"sonar.coverageReportPaths=tests1-coverage.xml" `
151-
-D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\build\**\*,tests\googletest\**\*,**\test-*,tests*-*.xml"
153+
-D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\googletest\**\,**\test-*,tests\stubs\**\*,tests*-*.xml*"

‎CHANGELOG.md

+14-14
Large diffs are not rendered by default.

‎HeaderMake/HeaderMake.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/*
88
Copyright (C) 2007-2008, kobake
99
Copyright (C) 2009, rastiv
10-
Copyright (C) 2018-2021, Sakura Editor Organization
10+
Copyright (C) 2018-2022, Sakura Editor Organization
1111
1212
This software is provided 'as-is', without any express or implied
1313
warranty. In no event will the authors be held liable for any damages
@@ -33,7 +33,7 @@
3333
/*
3434
++ 概要 ++
3535
36-
enum と define の2種類の定数定義ヘッダを生成するためのモノ
36+
enum と define の2種類の定数定義ヘッダーを生成するためのモノ
3737
3838
enum定数はソースコードから参照し、(デバッグがしやすくなる)
3939
define定数はリソースから参照する (リソース内ではenum定数を利用できない)

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
zlib License
22

3-
Copyright (C) 2018-2021, Sakura Editor Organization
3+
Copyright (C) 2018-2022, Sakura Editor Organization
44

55
This software is provided 'as-is', without any express or implied
66
warranty. In no event will the authors be held liable for any damages

‎addDoxygenFileComment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ doxygen は解析対象かどうかを `@file` コメントの有無で認識し
1616

1717
## ファイル構成
1818

19-
- `addDoxygenFileComment.py` : スクリプト本体。第一引数で指定したフォルダ以下のソースに対して `@file` コメントがなければ先頭行に付与します。
19+
- `addDoxygenFileComment.py` : スクリプト本体。第一引数で指定したフォルダー以下のソースに対して `@file` コメントがなければ先頭行に付与します。
2020
- `addDoxygenFileComment.bat` : `sakura_core` の引数を渡して `addDoxygenFileComment.py` を実行します。

‎addDoxygenFileComment.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def checkExtension(fileName):
1515
base, ext = os.path.splitext(fileName)
1616
return (ext in extensions)
1717

18-
# 引数で指定したフォルダ以下のすべての対象ファイルを yield で返す
18+
# 引数で指定したフォルダー以下のすべての対象ファイルを yield で返す
1919
def checkAll(topDir):
2020
for rootdir, dirs, files in os.walk(topDir):
2121
for fileName in files:

‎azure-pipelines.yml

+19-79
Original file line numberDiff line numberDiff line change
@@ -4,81 +4,27 @@
44
# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=azure-devops&viewFallbackFrom=vsts&tabs=yaml
55
###############################################################################################################################
66
trigger:
7-
branches:
8-
include:
9-
- master
10-
- develop
11-
- feature/*
12-
- revert-*
137
paths:
148
exclude:
15-
- .github/*
9+
- '**/*.md'
10+
- '.github/*'
1611
- .gitignore
17-
- .travis.yml
12+
- .editorconfig
1813
- appveyor.yml
19-
- CHANGELOG.md
20-
- CONTRIBUTING.md
21-
- CPPLINT.md
22-
- README.md
23-
- SonarQube.md
24-
- addDoxygenFileComment.md
25-
- build.md
26-
- create-big-file.md
27-
- debug-tasktray-menu.md
28-
- get-PR.md
29-
- ci/azure-pipelines/azure-pipelines.md
30-
- ci/build-batchfiles.md
31-
- ci/build-envvars.md
32-
- installer/externals/bregonig/README.md
33-
- installer/externals/universal-ctags/README.md
34-
- installer/readme.md
35-
- remove-redundant-blank-lines.md
36-
- tools/find-tools.md
37-
- tools/macro/macro.md
38-
- tools/zip/readme.md
39-
- tests/unittest.md
40-
- vcx-props/project-PlatformToolset.md
4114

4215
###############################################################################################################################
4316
# ビルドトリガー (Pull Request)
4417
#
4518
# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=azure-devops&tabs=yaml#pull-request-validation
4619
###############################################################################################################################
4720
pr:
48-
branches:
49-
include:
50-
- master
51-
- develop
52-
- feature/*
53-
- revert-*
5421
paths:
5522
exclude:
56-
- .github/*
23+
- '**/*.md'
24+
- '.github/*'
5725
- .gitignore
58-
- .travis.yml
26+
- .editorconfig
5927
- appveyor.yml
60-
- CHANGELOG.md
61-
- CONTRIBUTING.md
62-
- CPPLINT.md
63-
- README.md
64-
- SonarQube.md
65-
- addDoxygenFileComment.md
66-
- build.md
67-
- create-big-file.md
68-
- debug-tasktray-menu.md
69-
- get-PR.md
70-
- ci/azure-pipelines/azure-pipelines.md
71-
- ci/build-batchfiles.md
72-
- ci/build-envvars.md
73-
- installer/externals/bregonig/README.md
74-
- installer/externals/universal-ctags/README.md
75-
- installer/readme.md
76-
- remove-redundant-blank-lines.md
77-
- tools/find-tools.md
78-
- tools/macro/macro.md
79-
- tools/zip/readme.md
80-
- tests/unittest.md
81-
- vcx-props/project-PlatformToolset.md
8228

8329
###############################################################################################################################
8430
# jobs/job 定義
@@ -87,18 +33,6 @@ pr:
8733
###############################################################################################################################
8834
jobs:
8935

90-
# サクラエディタのビルドを行う JOB (VS2017)
91-
# * サクラエディタ本体
92-
# * HTML Help
93-
# * Installer
94-
# * 単体テスト
95-
- template: ci/azure-pipelines/template.job.build-unittest.yml
96-
parameters:
97-
name: VS2017
98-
vmImage: 'VS2017-Win2016'
99-
displayName: VS2017
100-
ARG_VSVERSION: 15
101-
10236
# サクラエディタのビルドを行う JOB (VS2019)
10337
# * サクラエディタ本体
10438
# * HTML Help
@@ -111,49 +45,55 @@ jobs:
11145
name: VS2019
11246
vmImage: 'windows-2019'
11347
displayName: VS2019
114-
ARG_VSVERSION: 16
48+
49+
# サクラエディタのビルドを行う JOB (VS2022)
50+
- template: ci/azure-pipelines/template.job.build-unittest.yml
51+
parameters:
52+
name: VS2022
53+
vmImage: 'windows-2022'
54+
displayName: VS2022
11555

11656
# サクラエディタのビルドを行う JOB(MinGW)
11757
# * サクラエディタ本体
11858
# * 単体テスト
11959
- template: ci/azure-pipelines/template.job.build-on-msys2.yml
12060
parameters:
12161
name: MinGW
122-
vmImage: 'VS2017-Win2016'
62+
vmImage: 'windows-latest'
12363
displayName: MinGW
12464

12565
# SonarQube で解析を行う JOB
12666
- template: ci/azure-pipelines/template.job.SonarQube.yml
12767
parameters:
12868
name: SonarQube
129-
vmImage: 'VS2017-Win2016'
69+
vmImage: 'windows-latest'
13070
displayName: SonarQube
13171

13272
# Cppcheck を行う JOB
13373
- template: ci/azure-pipelines/template.job.cppcheck.yml
13474
parameters:
13575
name: cppcheck
136-
vmImage: 'VS2017-Win2016'
76+
vmImage: 'windows-latest'
13777
displayName: cppcheck
13878

13979
# doxygen を行う JOB
14080
- template: ci/azure-pipelines/template.job.doxygen.yml
14181
parameters:
14282
name: doxygen
143-
vmImage: 'VS2017-Win2016'
83+
vmImage: 'windows-latest'
14484
displayName: doxygen
14585

14686
# 文字コードのチェックを行う JOB
14787
- template: ci/azure-pipelines/template.job.checkEncoding.yml
14888
parameters:
14989
name: checkEncoding
150-
vmImage: 'VS2017-Win2016'
90+
vmImage: 'windows-latest'
15191

15292
#############################################################################################################
15393
# Python スクリプトのコンパイル確認を行う job
15494
#############################################################################################################
15595
- template: ci/azure-pipelines/template.job.python-check.yml
15696
parameters:
15797
name: script_check
158-
vmImage: 'VS2017-Win2016'
98+
vmImage: 'windows-latest'
15999
displayName: script_check

‎build-gnu.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ path=C:\msys64\mingw64\bin;%path:C:\msys64\mingw64\bin;=%
3333
if not defined CMD_NINJA call %~dp0tools\find-tools.bat
3434

3535
@rem create output directory, all executables will be placed here.
36-
set OUTDIR=../../../../%platform%/%configuration%
37-
mkdir "%~dp0%platform%\%configuration%" > NUL 2>&1
36+
set OUTDIR=%~dp0%platform%\%configuration%
37+
mkdir %OUTDIR% > NUL 2>&1
3838

3939
@rem build "sakura_core".
4040
set SAKURA_CORE_MAKEFILE=%~dp0sakura_core\Makefile

‎ci/azure-pipelines/azure-pipelines.md

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ https://azure.microsoft.com/ja-jp/services/devops/pipelines/ にアクセスし
7676

7777
| JOB 名 | 説明 | job を定義する template |
7878
----|----|----
79-
|VS2017 | Visual Studio 2017 でサクラエディタのビルドを行う | [template.job.build-unittest.yml](template.job.build-unittest.yml) |
8079
|VS2019 | Visual Studio 2019 でサクラエディタのビルドを行う | [template.job.build-unittest.yml](template.job.build-unittest.yml) |
8180
|MinGW | MinGW でサクラエディタのビルドを行う | [template.job.build-on-msys2.yml](template.job.build-on-msys2.yml) |
8281
|SonarQube | SonarQube での解析を行う | [template.job.SonarQube.yml](template.job.SonarQube.yml) |

‎ci/azure-pipelines/template.job.build-unittest.yml

+18-7
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ jobs:
2626
BuildPlatform: 'x64'
2727
Configuration: 'Release'
2828

29-
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch
30-
variables:
31-
ARG_VSVERSION: ${{ parameters.ARG_VSVERSION }}
32-
3329
steps:
3430
# show environmental variables for debug.
3531
- script: set
@@ -51,13 +47,28 @@ jobs:
5147
displayName: Bitmap Split/Mux
5248

5349
# Install Locale Emulator
54-
- script: choco install locale-emulator -y
50+
- pwsh: |
51+
choco install autohotkey.install --confirm
52+
$LEExpandDir = "$(Build.SourcesDirectory)\tools\locale-emulator"
53+
$LEInitScript = "$(Build.SourcesDirectory)\ci\init-locale-emulator.ahk"
54+
New-Item "${LEExpandDir}" -ItemType Directory
55+
Invoke-WebRequest `
56+
"https://github.com/xupefei/Locale-Emulator/releases/download/v2.5.0.1/Locale.Emulator.2.5.0.1.zip" `
57+
-OutFile "${LEExpandDir}\locale-emulator.zip"
58+
Expand-Archive "${LEExpandDir}\locale-emulator.zip" "${LEExpandDir}"
59+
Start-Process "AutoHotKey" "${LEInitScript}"
60+
Start-Process "${LEExpandDir}\LEInstaller.exe"
61+
echo "##vso[task.prependpath]${LEExpandDir}"
5562
displayName: Install Locale Emulator
5663
5764
# Build HTML Help
5865
- script: build-chm.bat
5966
displayName: Build HTML Help
6067

68+
# Update/Install Inno Setup
69+
- pwsh: choco upgrade innosetup --confirm
70+
displayName: Update/Install Inno Setup
71+
6172
# Build installer with Inno Setup
6273
- script: build-installer.bat $(BuildPlatform) $(Configuration)
6374
displayName: Build installer with Inno Setup
@@ -76,7 +87,7 @@ jobs:
7687
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/conditions?view=azure-devops&tabs=yaml#job-status-functions
7788
#
7889
- task: CopyFiles@1
79-
condition: succeededOrFailed()
90+
condition: and(eq(variables['Configuration'], 'Release'), succeededOrFailed())
8091
displayName: Copy to ArtifactStagingDirectory
8192
inputs:
8293
contents: |
@@ -86,7 +97,7 @@ jobs:
8697

8798
# see https://docs.microsoft.com/en-us/azure/devops/pipelines/artifacts/build-artifacts?view=azure-devops&tabs=yaml
8899
- task: PublishBuildArtifacts@1
89-
condition: succeededOrFailed()
100+
condition: and(eq(variables['Configuration'], 'Release'), succeededOrFailed())
90101
displayName: Publish ArtifactStagingDirectory
91102
inputs:
92103
pathtoPublish: '$(Build.ArtifactStagingDirectory)'

0 commit comments

Comments
 (0)