バージョン情報で git の commit hash を表示する #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
ご対応ありがとうございます。動作良さそうです。 pre-build で PowerShell 使えればもう少しシンプルになりそうなんですけどね……今ちょっと調べています。 |
kobake
reviewed
May 31, 2018
sakura_core/dlg/CDlgAbout.cpp
Outdated
| HIWORD(dwVersionLS), | ||
| LOWORD(dwVersionLS) | ||
| ); | ||
| #elif (SVN_REV == 0) |
There was a problem hiding this comment.
svnrev 関連はもう使わないので「削除」しちゃってOKです
a69e8d0 で削除しました。
別のプルリクエストで対応しようと思ってたのですが、
このプルリクエストで対応しました。
kobake
reviewed
May 31, 2018
sakura_core/dlg/CDlgAbout.cpp
Outdated
| @@ -165,7 +167,14 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) | |||
| // �o�[�W����&���r�W������� | |||
| DWORD dwVersionMS, dwVersionLS; | |||
| GetAppVersionInfo( NULL, VS_VERSION_INFO, &dwVersionMS, &dwVersionLS ); | |||
| #if (SVN_REV == 0) | |||
| #if defined(GIT_COMMIT_HASH) | |||
| auto_sprintf(szMsg, _T("Ver. %d.%d.%d.%d\r\n(hash ") _T(GIT_COMMIT_HASH) _T(")\r\n"), | |||
There was a problem hiding this comment.
ここは hash よりも GitHash と明示したほうが良さそうに思いました
There was a problem hiding this comment.
ここは hash よりも GitHash と明示したほうが良さそうに思いました
eee259f で対応しました。
kobake
reviewed
May 31, 2018
sakura_core/sakura_rc.rc
Outdated
| #if (SVN_REV != 0) | ||
| #if defined(GIT_SHORT_COMMIT_HASH) | ||
| " (hash " GIT_SHORT_COMMIT_HASH ")" | ||
| #elif (SVN_REV != 0) |
There was a problem hiding this comment.
ここは hash よりも GitHash と明示したほうが良さそうに思いました（上と同様）
There was a problem hiding this comment.
ここは hash よりも GitHash と明示したほうが良さそうに思いました（上と同様）
上と同様 eee259f で対応しました。
Merged
|
#28 はリファクタリングネタとして、このプルリクエストとは別に対応するとして、このプルリクエストは一旦マージしませんか？ |
|
そですね、挙動問題ないので一旦マージしちゃいます。 ご対応ありがとうございました！ |
HoppingTappy
pushed a commit
to HoppingTappy/sakura
that referenced
this pull request
Jun 11, 2019
HoppingTappy
pushed a commit
to HoppingTappy/sakura
that referenced
this pull request
Jun 11, 2019
HoppingTappy
pushed a commit
to HoppingTappy/sakura
that referenced
this pull request
Jun 11, 2019
…-commit-hash バージョン情報で git の commit hash を表示する
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
バージョン情報で git の commit hash を表示する
git の commit hash の取得
git show -s --format=%H
git の commit hash (短い形式) の取得
git show -s --format=%h
バッチファイルのエスケープ
http://www.robvanderwoude.com/escapechars.php
コマンド出力を変数に代入する方法
http://bleis-tift.hatenablog.com/entry/20080502/1209689071