Skip to content

Commit

Permalink
Merge pull request sakura-editor#565 from m-tmatma/feature/doxygen-conf
Browse files Browse the repository at this point in the history
doxygen の設定ファイルと実行用のバッチファイルを追加
  • Loading branch information
m-tmatma authored Nov 22, 2018
2 parents 154cc73 + 5e83487 commit be69ed2
Show file tree
Hide file tree
Showing 10 changed files with 2,604 additions and 3 deletions.
7 changes: 7 additions & 0 deletions appveyor.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@
|[build-installer.bat](build-installer.bat) | インストーラをビルドするバッチファイル |
|[externals\cppcheck\install-cppcheck.bat](externals/cppcheck/install-cppcheck.bat) | cppcheck をインストールするバッチファイル |
|[run-cppcheck.bat](run-cppcheck.bat) | cppcheck を実行するバッチファイル |
|[externals\doxygen\install-doxygen.bat](externals/doxygen/install-doxygen.bat) | doxygen をインストールするバッチファイル |
|[run-doxygen.bat](run-doxygen.bat) | doxygen を実行するバッチファイル |
|[zipArtifacts.bat](zipArtifacts.bat) | 成果物を zip に固めるバッチファイル |
|[calc-hash.bat](calc-hash.bat) | 成果物の sha256 を計算するバッチファイル |

Expand Down Expand Up @@ -94,6 +96,9 @@
- msiexec.exe
- [run-cppcheck.bat](run-cppcheck.bat) : cppcheck を実行する
- cppcheck.exe
- [externals\doxygen\install-doxygen.bat](externals/doxygen/install-doxygen.bat) : doxygen をインストールする
- [run-doxygen.bat](run-doxygen.bat) : doxygen を実行する
- doxygen.exe
- [build-installer.bat](build-installer.bat) : Installer をビルドする
- [ISCC.exe](http://www.jrsoftware.org/isinfo.php) : InnoSetup でインストーラをビルドする
- [zipArtifacts.bat](zipArtifacts.bat) : 成果物を zip で固める
Expand Down Expand Up @@ -121,6 +126,8 @@
|build-installer.bat | platform ("Win32" または "x64") | configuration ("Debug" または "Release") |
|externals\cppcheck\install-cppcheck.bat | なし | なし |
|run-cppcheck.bat | platform ("Win32" または "x64") | configuration ("Debug" または "Release") |
|externals\doxygen\install-doxygen.bat | なし | なし |
|run-doxygen.bat | platform ("Win32" または "x64") | configuration ("Debug" または "Release") |
|zipArtifacts.bat | platform ("Win32" または "x64") | configuration ("Debug" または "Release") |
|calc-hash.bat | sha256 のハッシュ値の出力先ファイル | ハッシュ値を計算するフォルダパス |

Expand Down
10 changes: 10 additions & 0 deletions build-all.bat
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ call run-cppcheck.bat %PLATFORM% %CONFIGURATION% || (echo error run-cppcheck.
@echo ---- end run-cppcheck.bat ----
@echo.

@echo ---- start externals\doxygen\install-doxygen.bat ----
call externals\doxygen\install-doxygen.bat || (echo error externals\doxygen\install-doxygen.bat && exit /b 1)
@echo ---- end externals\doxygen\install-doxygen.bat ----
@echo.

@echo ---- start run-doxygen.bat ----
call run-doxygen.bat %PLATFORM% %CONFIGURATION% || (echo error run-doxygen.bat && exit /b 1)
@echo ---- end run-doxygen.bat ----
@echo.

@echo ---- start zipArtifacts.bat ----
call zipArtifacts.bat %PLATFORM% %CONFIGURATION% || (echo error zipArtifacts.bat && exit /b 1)
@echo ---- end zipArtifacts.bat ----
Expand Down
2,512 changes: 2,512 additions & 0 deletions doxygen.conf

Large diffs are not rendered by default.

Binary file added externals/doxygen/doxygen-1.8.14-setup.exe
Binary file not shown.
8 changes: 8 additions & 0 deletions externals/doxygen/install-doxygen.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@echo off
@echo installing
set DOXYGEN_INSTALLER=doxygen-1.8.14-setup.exe
if not "%APPVEYOR_BUILD_NUMBER%" == "" (
%~dp0%DOXYGEN_INSTALLER% /silent /suppressmsgboxes
) else (
@echo skip installing %DOXYGEN_INSTALLER%
)
16 changes: 16 additions & 0 deletions run-doxygen.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
call sakura\githash.bat
call tools\hhc\find-hhc.bat
call tools\doxygen\find-doxygen.bat

if exist html rmdir /s /q html

set PROJECT_NUMBER=%GIT_SHORT_COMMIT_HASH%
set HHC_LOCATION=%CMD_HHC%

if "%CMD_DOXYGEN%" == "" (
echo doxygen was not found
) else if exist "%CMD_DOXYGEN%" (
"%CMD_DOXYGEN%" doxygen.conf
) else (
echo doxygen was not found
)
3 changes: 0 additions & 3 deletions sakura/githash.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@echo off

SETLOCAL

set OUT_DIR=%1
if "%OUT_DIR%" == "" (
set OUT_DIR=.
Expand Down Expand Up @@ -129,7 +127,6 @@ if not errorlevel 1 (
@echo %GITHASH_H% was updated.
)

ENDLOCAL
exit /b 0

:output_githash
Expand Down
32 changes: 32 additions & 0 deletions tools/doxygen/find-doxygen.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@rem see readme.md
@echo off
set CMD_DOXYGEN=
set PATH_DOXYGEN_1=
set PATH_DOXYGEN_2=
set PATH_DOXYGEN_3=

if not "%ProgramFiles%" == "" set "PATH_DOXYGEN_1=%ProgramFiles%\doxygen\bin\doxygen.exe"
if not "%ProgramFiles(x86)%" == "" set "PATH_DOXYGEN_2=%ProgramFiles(x86)%\doxygen\bin\doxygen.exe"
if not "%ProgramW6432%" == "" set "PATH_DOXYGEN_3=%ProgramW6432%\doxygen\bin\doxygen.exe"

set RESULT_PATH_DOXYGEN_1=--
set RESULT_PATH_DOXYGEN_2=--
set RESULT_PATH_DOXYGEN_3=--

if exist "%PATH_DOXYGEN_1%" (
set RESULT_PATH_DOXYGEN_1=OK
set "CMD_DOXYGEN=%PATH_DOXYGEN_1%"
) else if exist "%PATH_DOXYGEN_2%" (
set RESULT_PATH_DOXYGEN_2=OK
set "CMD_DOXYGEN=%PATH_DOXYGEN_2%"
) else if exist "%PATH_DOXYGEN_3%" (
set RESULT_PATH_DOXYGEN_3=OK
set "CMD_DOXYGEN=%PATH_DOXYGEN_3%"
)

@echo %RESULT_PATH_DOXYGEN_1% %PATH_DOXYGEN_1%
@echo %RESULT_PATH_DOXYGEN_2% %PATH_DOXYGEN_2%
@echo %RESULT_PATH_DOXYGEN_3% %PATH_DOXYGEN_3%
@echo.
@echo CMD_DOXYGEN "%CMD_DOXYGEN%"
@echo.
17 changes: 17 additions & 0 deletions tools/doxygen/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!-- TOC -->

- [doxygen のパスを見つけるバッチファイル](#doxygen-のパスを見つけるバッチファイル)
- [ロジック](#ロジック)
<!-- /TOC -->

# doxygen のパスを見つけるバッチファイル

doxygen.exe のパスを見つけて 環境変数 `CMD_DOXYGEN` に設定する

## ロジック

以下の順番でパスを検索して、見つかったパスを環境変数 `CMD_DOXYGEN` にセットする。

- %ProgramFiles%\doxygen\bin\doxygen.exe
- %ProgramFiles(x86)%\doxygen\bin\doxygen.exe
- %ProgramW6432%\doxygen\bin\doxygen.exe
2 changes: 2 additions & 0 deletions zipArtifacts.bat
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ copy /Y /B %INSTALLER_RESOURCES_CTAGS%\license\*.* %WORKDIR_EXE%\license\ctags\
copy /Y /B help\macro\macro.chm %WORKDIR_EXE%\
copy /Y /B help\plugin\plugin.chm %WORKDIR_EXE%\
copy /Y /B help\sakura\sakura.chm %WORKDIR_EXE%\
copy /Y /B html\sakura-doxygen.chm %WORKDIR_EXE%\
copy /Y /B html\sakura-doxygen.chi %WORKDIR_EXE%\

copy /Y /B installer\Output-%platform%\*.exe %WORKDIR_INST%\
copy /Y msbuild-%platform%-%configuration%.log %WORKDIR_LOG%\
Expand Down

0 comments on commit be69ed2

Please sign in to comment.