From 813adcef7dadf73f011f3a8891c3a31137ea7447 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 11 Feb 2020 07:31:14 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=8C=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=AA=E3=82=8B=E6=9D=A1=E4=BB=B6=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB=E3=81=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=201.=20GIT=5FSHORT=5FCOMMIT=5FHASH?= =?UTF-8?q?=20=3D>=20GITHUB=5FCOMMIT=5FURL=202.=20GITHUB=5FPR=5FNUMBER=5FL?= =?UTF-8?q?ABEL=20=3D>=20GITHUB=5FCOMMIT=5FURL=5FPR=5FHEAD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 はもともと TEMP_GIT_SHORT_COMMIT_HASH だったので CI の場合に有効になる変数だったが、 GIT_SHORT_COMMIT_HASH に変更するとローカルビルドでも有効になるので動作を合わせるために GITHUB_COMMIT_URL で判断するように変更 2 は変更の必要はないが、 1 と処理を同様にするために合わせて変更する。 --- sakura_core/dlg/CDlgAbout.cpp | 4 ++-- sakura_core/sakura_rc.rc | 6 +++--- sakura_lang_en_US/sakura_lang_rc.rc | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index 985775b27f..a96a9f6489 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -277,10 +277,10 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) #ifdef CI_BUILD_NUMBER_LABEL m_UrlBuildLinkWnd.SetSubclassWindow( GetItemHwnd( IDC_STATIC_URL_CI_BUILD ) ); #endif -#ifdef GIT_SHORT_COMMIT_HASH +#if defined( GITHUB_COMMIT_URL ) m_UrlGitHubCommitWnd.SetSubclassWindow( GetItemHwnd( IDC_STATIC_URL_GITHUB_COMMIT ) ); #endif -#ifdef GITHUB_PR_NUMBER_LABEL +#if defined( GITHUB_COMMIT_URL_PR_HEAD ) m_UrlGitHubPRWnd.SetSubclassWindow( GetItemHwnd( IDC_STATIC_URL_GITHUB_PR ) ); #endif diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 9990d6b50f..d2f884e9a5 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -114,13 +114,13 @@ BEGIN LTEXT "Build URL:", IDC_STATIC_URL_CI_BUILD_CAPTION, 33, 123, 71, 8, NOT WS_GROUP LTEXT CI_BUILD_NUMBER_LABEL, IDC_STATIC_URL_CI_BUILD, 101, 123, 120, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP #endif -#if defined( GIT_SHORT_COMMIT_HASH ) || defined( GITHUB_PR_NUMBER_LABEL ) +#if defined( GITHUB_COMMIT_URL ) || defined( GITHUB_COMMIT_URL_PR_HEAD ) LTEXT "GitHub URL:", IDC_STATIC_URL_GITHUB_CAPTION, 33, 133, 50, 8, NOT WS_GROUP #endif -#ifdef GIT_SHORT_COMMIT_HASH +#if defined( GITHUB_COMMIT_URL ) LTEXT GIT_SHORT_COMMIT_HASH, IDC_STATIC_URL_GITHUB_COMMIT, 101, 133, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP #endif -#ifdef GITHUB_PR_NUMBER_LABEL +#if defined( GITHUB_COMMIT_URL_PR_HEAD ) LTEXT GITHUB_PR_NUMBER_LABEL, IDC_STATIC_URL_GITHUB_PR, 150, 133, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP #endif EDITTEXT IDC_EDIT_ABOUT, 5, 146, 233, 53, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index c15a54b06a..ad6f7e9fdc 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -120,13 +120,13 @@ BEGIN LTEXT "Build URL:", IDC_STATIC_URL_CI_BUILD_CAPTION, 33, 123, 71, 8, NOT WS_GROUP LTEXT CI_BUILD_NUMBER_LABEL, IDC_STATIC_URL_CI_BUILD, 101, 123, 120, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP #endif -#if defined( GIT_SHORT_COMMIT_HASH ) || defined( GITHUB_PR_NUMBER_LABEL ) +#if defined( GITHUB_COMMIT_URL ) || defined( GITHUB_COMMIT_URL_PR_HEAD ) LTEXT "GitHub URL:", IDC_STATIC_URL_GITHUB_CAPTION, 33, 133, 50, 8, NOT WS_GROUP #endif -#ifdef GIT_SHORT_COMMIT_HASH +#if defined( GITHUB_COMMIT_URL ) LTEXT GIT_SHORT_COMMIT_HASH, IDC_STATIC_URL_GITHUB_COMMIT, 101, 133, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP #endif -#ifdef GITHUB_PR_NUMBER_LABEL +#if defined( GITHUB_COMMIT_URL_PR_HEAD ) LTEXT GITHUB_PR_NUMBER_LABEL, IDC_STATIC_URL_GITHUB_PR, 150, 133, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP #endif EDITTEXT IDC_EDIT_ABOUT, 5, 146, 233, 53, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP