[x64対応] バージョン情報にPlatform情報を埋め込み (32bit/64bit) #179
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
kobake
force-pushed
the
version-platform-info
branch
from
28f93e5
to
2b43a34
Compare
kobake
changed the title
|
調整完了しました。 |
kobake
changed the title
|
一部不具合があったので直します |
kobake
changed the title
|
調整完了しました。x64 版のリソースビルド時に _WIN64 が定義されていなかったのでプロジェクト設定で定義を追加しました。 |
m-tmatma
reviewed
Jun 24, 2018
sakura_core/dlg/CDlgAbout.cpp
Outdated
| @@ -26,6 +26,7 @@ | |||
| #include "util/module.h" | |||
| #include "gitrev.h" | |||
There was a problem hiding this comment.
で gitrev.h をインクルードするので version.h のインクルードだけにできます。
There was a problem hiding this comment.
たしかに。30e4286 で gitrev.h のインクルードをすべて version.h に集約しました。
m-tmatma
reviewed
Jun 24, 2018
sakura_core/version.h
Outdated
|
|
||
| // リソース埋め込み用バージョン文字列 | ||
| // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" | ||
| #define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM " " VER_CONFIG |
There was a problem hiding this comment.
#90 で書きましたが、Release 版のときに、
VER_CONFIG の前に空白入る件お願いします。
m-tmatma
reviewed
Jun 24, 2018
| #ifndef _UNICODE | ||
| " ANSI" | ||
| #endif | ||
| VALUE "ProductVersion", RESOURCE_VERSION_STRING(PR_VER_STR) // e.g. "2.3.2.0 4a0de579 UNICODE 64bit DEBUG" |
There was a problem hiding this comment.
m-tmatma
reviewed
Jun 24, 2018
| #if defined(GIT_COMMIT_HASH) | ||
| cmemMsg.AppendString(_T("(GitHash " GIT_COMMIT_HASH ")\r\n")); | ||
| #endif | ||
| cmemMsg.AppendString( szMsg ); |
There was a problem hiding this comment.
以下のようにするのはいかがでしょうか?
追加や削除が容易になると思います。
#ifdef GIT_COMMIT_HASH
#define VER_GITHASH "(GitHash " GIT_COMMIT_HASH ")"
#else
#define VER_GITHASH ""
#endif
DWORD dwVersionMS, dwVersionLS;
GetAppVersionInfo( NULL, VS_VERSION_INFO, &dwVersionMS, &dwVersionLS );
auto_sprintf(szMsg,
_T("v%d.%d.%d.%d"),
HIWORD(dwVersionMS), LOWORD(dwVersionMS), HIWORD(dwVersionLS), LOWORD(dwVersionLS) // e.g. {2, 3, 2, 0}
);
cmemMsg.AppendString( szMsg );
cmemMsg.AppendString( _T(" ") _T(VER_PLATFORM) );
#ifdef _DEBUG
cmemMsg.AppendString( _T(" ") _T(VER_CONFIG) );
#endif
#ifdef GIT_COMMIT_HASH
cmemMsg.AppendString( _T("\r\n") _T(VER_GITHASH) _T("\r\n"));
#endif
#if defined(GIT_URL)
cmemMsg.AppendString(_T("(GitURL " GIT_URL ")\r\n"));
#endif
cmemMsg.AppendString( _T("\r\n") );
m-tmatma
approved these changes
Jun 25, 2018
認識してしましたが重要な問題ではないと判断し（可読性のほうを重視して）そのままにしてあります。 |
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.
#90 のコンフリクトを解消した版。
諸事情でリポジトリの Fork をし直したので PR も作り直します。
対応内容