バージョン情報で git の commit hash を表示する

sakura/.gitignore

@@ -33,3 +33,4 @@
 /_UpgradeReport_Files
 /ipch
 /UpgradeLog.XML
+/.vs

sakura/preBuild.bat

@@ -4,13 +4,26 @@ HeaderMake -in=..\sakura_core\Funccode_x.hsrc -out=..\sakura_core\Funccode_defin
 HeaderMake -in=..\sakura_core\Funccode_x.hsrc -out=..\sakura_core\Funccode_enum.h -mode=enum -enum=EFunctionCode
 MakefileMake -file=..\sakura_core\Makefile -dir=..\sakura_core
 
-SubWCRev.exe "..\\" "..\sakura_core\svnrev_template.h" "..\sakura_core\svnrev.h"
-if %ERRORLEVEL% NEQ 0 (
-  echo Automatic revision update unavailable, using generic template instead.
-  echo You can safely ignore this message - see svnrev.h for details.
-  copy /Y "..\sakura_core\svnrev_unknown.h" "..\sakura_core\svnrev.h"
+set GITREV_H=..\sakura_core\gitrev.h
+
+for /f "usebackq" %%s in (`git show -s --format^=%%H`) do (
+    set COMMITID=%%s
+)
+for /f "usebackq" %%s in (`git show -s --format^=%%h`) do (
+    set SHORT_COMMITID=%%s
+)
+
+type nul                                  > %GITREV_H%
+if "%COMMITID%" == "" (
+	type nul                                  >> %GITREV_H%
+) else (
+	echo #define GIT_COMMIT_HASH "%COMMITID%" >> %GITREV_H%
+)
+if "%SHORT_COMMITID%" == "" (
+	type nul                                              >> %GITREV_H%
+) else (
+	echo #define GIT_SHORT_COMMIT_HASH "%SHORT_COMMITID%" >> %GITREV_H%
 )
 
 ENDLOCAL
-:: Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
 rem exit 0

sakura/sakura_vc2017.vcxproj

@@ -461,7 +461,7 @@
     <ClInclude Include="..\sakura_core\sakura_rc.h" />
     <ClInclude Include="..\sakura_core\StdAfx.h" />
     <ClInclude Include="..\sakura_core\String_define.h" />
-    <ClInclude Include="..\sakura_core\svnrev.h" />
+    <ClInclude Include="..\sakura_core\gitrev.h" />
     <ClInclude Include="..\sakura_core\typeprop\CDlgKeywordSelect.h" />
     <ClInclude Include="..\sakura_core\typeprop\CDlgSameColor.h" />
     <ClInclude Include="..\sakura_core\typeprop\CDlgTypeAscertain.h" />

sakura/sakura_vc2017.vcxproj.filters

@@ -136,9 +136,6 @@
     <ClInclude Include="..\sakura_core\StdAfx.h">
       <Filter>Other Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\sakura_core\svnrev.h">
-      <Filter>Other Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\sakura_core\String_define.h">
       <Filter>Other Files</Filter>
     </ClInclude>

sakura_core/.gitignore

@@ -1 +1 @@
-/svnrev.h
+/gitrev.h

sakura_core/dlg/CDlgAbout.cpp

@@ -24,7 +24,7 @@
 #include "uiparts/HandCursor.h"
 #include "util/file.h"
 #include "util/module.h"
-#include "svnrev.h"
+#include "gitrev.h"
 #include "sakura_rc.h" // 2002/2/10 aroka ���A
 #include "sakura.hh"
 
@@ -152,7 +152,8 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
 	//	2010.04.15 Moca �R���p�C�����𕪗�/WIN�w�b�_,N_SHAREDATA_VERSION�lj�
 
 	// �ȉ��̌`���ŏo��
-	//�T�N���G�f�B�^   Ver. 2.0.0.0 (Rev.9999)
+	//�T�N���G�f�B�^   Ver. 2.0.0.0
+	//(GitHash xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)
 	//
 	//      Share Ver: 96
 	//      Compile Info: V 1400  WR WIN600/I601/C000/N600
@@ -165,12 +166,12 @@ 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)
-	auto_sprintf( szMsg, _T("Ver. %d.%d.%d.%d\r\n"),
-		HIWORD( dwVersionMS ),
-		LOWORD( dwVersionMS ),
-		HIWORD( dwVersionLS ),
-		LOWORD( dwVersionLS )
+#if defined(GIT_COMMIT_HASH)
+	auto_sprintf(szMsg, _T("Ver. %d.%d.%d.%d\r\n(GitHash ") _T(GIT_COMMIT_HASH) _T(")\r\n"),
+		HIWORD(dwVersionMS),
+		LOWORD(dwVersionMS),
+		HIWORD(dwVersionLS),
+		LOWORD(dwVersionLS)
 	);
 #else
 	auto_sprintf( szMsg, _T("Ver. %d.%d.%d.%d (Rev.") _T(SVN_REV_STR) _T(")\r\n"),

sakura_core/sakura_rc.rc

@@ -5,7 +5,7 @@
 #ifndef SAKURA_LANG_RESOURCE
 	#include "sakura_rc.h"
 	#include "Funccode_define.h"
-	#include "svnrev.h"
+	#include "gitrev.h"
 	#include "String_define.h"
 #else
 	#include "sakura_lang.h"
@@ -2811,8 +2811,8 @@ BEGIN
             VALUE "OriginalFilename", "sakura.exe\0"
             VALUE "ProductName", "�T�N���G�f�B�^\0"
             VALUE "ProductVersion", PR_VER_STR
-#if (SVN_REV != 0)
-                " (Rev." SVN_REV_STR ")"
+#if defined(GIT_SHORT_COMMIT_HASH)
+                " (GitHash " GIT_SHORT_COMMIT_HASH ")"
 #endif
 #ifdef _DEBUG
                 " Debug version"