リンクが有効になる条件コンパイルの条件を変更

1. GIT_SHORT_COMMIT_HASH => GITHUB_COMMIT_URL 2. GITHUB_PR_NUMBER_LABEL => GITHUB_COMMIT_URL_PR_HEAD 1 はもともと TEMP_GIT_SHORT_COMMIT_HASH だったので CI の場合に有効になる変数だったが、 GIT_SHORT_COMMIT_HASH に変更するとローカルビルドでも有効になるので動作を合わせるために GITHUB_COMMIT_URL で判断するように変更 2 は変更の必要はないが、 1 と処理を同様にするために合わせて変更する。
sakura-editor · Feb 10, 2020 · 813adce · 813adce
1 parent 8a2b595
commit 813adce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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