Merge pull request #1193 from m-tmatma/feature/abolish-TEMP_GIT_COMMI…

…T_HASH TEMP_GIT_SHORT_COMMIT_HASH および TEMP_GIT_COMMIT_HASH を廃止する
sakura-editor · Feb 11, 2020 · fc8f914 · fc8f914
2 parents fdb92d4 + 813adce
commit fc8f914
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 42 deletions.
diff --git a/ci-build.md b/ci-build.md
@@ -8,8 +8,6 @@
 |GIT_SHORT_COMMIT_HASH|git の commit Hash 短縮形|◎|◎|◎|◎|
 |GIT_REMOTE_ORIGIN_URL|git remote origin URL|◎|◎|◎|◎|
 |GIT_TAG_NAME|git の tag|◎|◎|◎|◎|
-|TEMP_GIT_COMMIT_HASH|CI のときに有効な commit Hash|×|◎|◎|◎|
-|TEMP_GIT_SHORT_COMMIT_HASH|CI のときに有効な commit Hash 短縮形|×|◎|◎|◎|
 |CI_ACCOUNT_NAME|CI のアカウント名|×|◎|◎|◎|
 |CI_BUILD_NUMBER|CI のビルド番号 (数値)|×|◎|◎|◎|
 |CI_BUILD_URL|CI のビルドURL|×|◎|◎|◎|
@@ -64,8 +62,6 @@ APPVEYOR_REPO_TAG_NAME は利用をやめて 代わりに GIT_TAG_NAME を使う
 |--|--|--|
 |GIT_SHORT_COMMIT_HASH|GIT_SHORT_COMMIT_HASH|文字列|
 |GIT_COMMIT_HASH|GIT_COMMIT_HASH|文字列|
-|TEMP_GIT_SHORT_COMMIT_HASH|TEMP_GIT_SHORT_COMMIT_HASH|文字列|
-|TEMP_GIT_COMMIT_HASH|TEMP_GIT_COMMIT_HASH|文字列|
 |GIT_REMOTE_ORIGIN_URL|GIT_REMOTE_ORIGIN_URL|文字列|
 |GIT_TAG_NAME|GIT_TAG_NAME|文字列|
 |CI_REPO_NAME|CI_REPO_NAME|文字列|
@@ -95,7 +91,7 @@ APPVEYOR_REPO_TAG_NAME は利用をやめて 代わりに GIT_TAG_NAME を使う
 | TAG_NAME      | "tag_" + tag 名                                    | tag が有効な場合                       |
 | BUILD_NUMBER  | "build" + ビルド番号                               | CI ビルド以外の場合 "buildLocal"       |
 | PR_NAME       | "PR" + PR番号                                      | CI での PR のビルドのみ有効            |
-| SHORTHASH     | commit hash の先頭8文字                            | 実体は TEMP_GIT_SHORT_COMMIT_HASH      |
+| SHORTHASH     | commit hash の先頭8文字                            | 実体は GIT_SHORT_COMMIT_HASH      |
 | RELEASE_PHASE | "alpha" または 空                                  | x64 ビルドの場合のみ有効               |
 | BASENAME      | 成果物の zip ファイル名(拡張子含まない部分)        | 常に有効                               |
 | WORKDIR       | 作業用フォルダ                                     | 常に有効                               |

diff --git a/help/make-artifacts.bat b/help/make-artifacts.bat
@@ -51,7 +51,7 @@ if not "%GITHUB_PR_NUMBER%" == "" (
 )
 
 @echo hash name
-set SHORTHASH=%TEMP_GIT_SHORT_COMMIT_HASH%
+set SHORTHASH=%GIT_SHORT_COMMIT_HASH%
 
 @rem ----------------------------------------------------------------
 @rem build BASENAME

diff --git a/sakura/githash.bat b/sakura/githash.bat
@@ -66,17 +66,6 @@ exit /b 0
 	@rem get back to the original directory
 	popd
 
-	@echo checking GIT_SHORT_COMMIT_HASH, GIT_COMMIT_HASH
-	if not "%APPVEYOR%" == "" (
-		set TEMP_GIT_SHORT_COMMIT_HASH=%GIT_SHORT_COMMIT_HASH%
-		set TEMP_GIT_COMMIT_HASH=%GIT_COMMIT_HASH%
-	) else if defined BUILD_REPOSITORY_NAME (
-		set TEMP_GIT_SHORT_COMMIT_HASH=%GIT_SHORT_COMMIT_HASH%
-		set TEMP_GIT_COMMIT_HASH=%GIT_COMMIT_HASH%
-	) else (
-		set TEMP_GIT_SHORT_COMMIT_HASH=
-		set TEMP_GIT_COMMIT_HASH=
-	)
 	exit /b 0
 
 :set_repo_and_pr_variables
@@ -143,7 +132,7 @@ exit /b 0
 
 	set PREFIX_GITHUB=https://github.com
 	if "%GITHUB_ON%" == "1" (
-		set "GITHUB_COMMIT_URL=%PREFIX_GITHUB%/%CI_REPO_NAME%/commit/%TEMP_GIT_COMMIT_HASH%"
+		set "GITHUB_COMMIT_URL=%PREFIX_GITHUB%/%CI_REPO_NAME%/commit/%GIT_COMMIT_HASH%"
 		@rem Not Pull Request
 		if "%GITHUB_PR_NUMBER%" == "" (
 			@rem No PR
@@ -204,8 +193,6 @@ exit /b 0
 	) else (
 		@echo GIT_SHORT_COMMIT_HASH : %GIT_SHORT_COMMIT_HASH%
 		@echo GIT_COMMIT_HASH       : %GIT_COMMIT_HASH%
-		@echo TEMP_GIT_SHORT_COMMIT_HASH : %TEMP_GIT_SHORT_COMMIT_HASH%
-		@echo TEMP_GIT_COMMIT_HASH       : %TEMP_GIT_COMMIT_HASH%
 		@echo GIT_REMOTE_ORIGIN_URL : %GIT_REMOTE_ORIGIN_URL%
 		@echo GIT_TAG_NAME          : %GIT_TAG_NAME%
 		@echo.
@@ -244,17 +231,6 @@ exit /b 0
 		echo #define GIT_COMMIT_HASH "%GIT_COMMIT_HASH%"
 	)
 
-	if "%TEMP_GIT_SHORT_COMMIT_HASH%" == "" (
-		echo // TEMP_GIT_SHORT_COMMIT_HASH is not defined
-	) else (
-		echo #define TEMP_GIT_SHORT_COMMIT_HASH "%TEMP_GIT_SHORT_COMMIT_HASH%"
-	)
-	if "%TEMP_GIT_COMMIT_HASH%" == "" (
-		echo // TEMP_GIT_COMMIT_HASH is not defined
-	) else (
-		echo #define TEMP_GIT_COMMIT_HASH "%TEMP_GIT_COMMIT_HASH%"
-	)
-
 	if "%GIT_REMOTE_ORIGIN_URL%" == "" (
 		echo // GIT_REMOTE_ORIGIN_URL is not defined
 	) else (

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 TEMP_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( TEMP_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 TEMP_GIT_SHORT_COMMIT_HASH
-    LTEXT           TEMP_GIT_SHORT_COMMIT_HASH, IDC_STATIC_URL_GITHUB_COMMIT, 101, 133, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP
+#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( TEMP_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 TEMP_GIT_SHORT_COMMIT_HASH
-	LTEXT           TEMP_GIT_SHORT_COMMIT_HASH, IDC_STATIC_URL_GITHUB_COMMIT, 101, 133, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP
+#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/zipArtifacts.bat b/zipArtifacts.bat
@@ -74,7 +74,7 @@ if not "%GITHUB_PR_NUMBER%" == "" (
 )
 
 @echo hash name
-set SHORTHASH=%TEMP_GIT_SHORT_COMMIT_HASH%
+set SHORTHASH=%GIT_SHORT_COMMIT_HASH%
 
 if "%ALPHA%" == "1" (
 	set RELEASE_PHASE=alpha