Skip to content

Commit

Permalink
sakura-editor#18, sakura-editor#19: svn 関連のリビジョン関連の処理、ファイルを削除
Browse files Browse the repository at this point in the history
  • Loading branch information
m-tmatma committed May 31, 2018
1 parent eee259f commit a69e8d0
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 28 deletions.
8 changes: 0 additions & 8 deletions sakura/preBuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,5 @@ if "%SHORT_COMMITID%" == "" (
echo #define GIT_SHORT_COMMIT_HASH "%SHORT_COMMITID%" >> %GITREV_H%
)

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"
)

ENDLOCAL
:: Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
rem exit 0
1 change: 0 additions & 1 deletion sakura/sakura_vc2017.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,6 @@
<ClInclude Include="..\sakura_core\StdAfx.h" />
<ClInclude Include="..\sakura_core\String_define.h" />
<ClInclude Include="..\sakura_core\gitrev.h" />
<ClInclude Include="..\sakura_core\svnrev.h" />
<ClInclude Include="..\sakura_core\typeprop\CDlgKeywordSelect.h" />
<ClInclude Include="..\sakura_core\typeprop\CDlgSameColor.h" />
<ClInclude Include="..\sakura_core\typeprop\CDlgTypeAscertain.h" />
Expand Down
3 changes: 0 additions & 3 deletions sakura/sakura_vc2017.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sakura_core/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/gitrev.h
/svnrev.h
8 changes: 0 additions & 8 deletions sakura_core/dlg/CDlgAbout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "util/file.h"
#include "util/module.h"
#include "gitrev.h"
#include "svnrev.h"
#include "sakura_rc.h" // 2002/2/10 aroka 復帰
#include "sakura.hh"

Expand Down Expand Up @@ -174,13 +173,6 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
HIWORD(dwVersionLS),
LOWORD(dwVersionLS)
);
#elif (SVN_REV == 0)
auto_sprintf( szMsg, _T("Ver. %d.%d.%d.%d\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"),
HIWORD( dwVersionMS ),
Expand Down
3 changes: 0 additions & 3 deletions sakura_core/sakura_rc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "sakura_rc.h"
#include "Funccode_define.h"
#include "gitrev.h"
#include "svnrev.h"
#include "String_define.h"
#else
#include "sakura_lang.h"
Expand Down Expand Up @@ -2814,8 +2813,6 @@ BEGIN
VALUE "ProductVersion", PR_VER_STR
#if defined(GIT_SHORT_COMMIT_HASH)
" (GitHash " GIT_SHORT_COMMIT_HASH ")"
#elif (SVN_REV != 0)
" (Rev." SVN_REV_STR ")"
#endif
#ifdef _DEBUG
" Debug version"
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/svnrev_template.h

This file was deleted.

2 changes: 0 additions & 2 deletions sakura_core/svnrev_unknown.h

This file was deleted.

0 comments on commit a69e8d0

Please sign in to comment.