Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SVN Revision 利用箇所を削除し、代わりに GitHash を用いる #147

Merged
merged 2 commits into from
Jun 20, 2018
Merged

SVN Revision 利用箇所を削除し、代わりに GitHash を用いる #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38e25c2
SVN Revision 利用箇所を削除し、代わりに GitHash を用いる
kobake Jun 19, 2018
34f4a47
svnrev.h 参照コードを削除
kobake Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions sakura_core/dlg/CDlgAbout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
HIWORD(dwVersionLS),
LOWORD(dwVersionLS)
);
Copy link
Member

@m-tmatma m-tmatma Jun 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GIT_COMMIT_HASH が定義されていないとバージョン情報自体がなくなります。
GIT_COMMIT_HASH が定義されていないとき GIT_COMMIT_HASH の以外の部分は残すべきだと思います。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

本PRはあくまでも SVN 依存のせいでビルド自体が通らなくなることの解決を目的としているので、別件対応とさせてください。#148 を立てました。

ちなみにここのロジックは #19 で対応されたところですね。（当時の時点では git hash が存在しないケースが考慮されていなかったと思われる）

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

指摘した箇所は この PR で修正されたもので過去の対応ではないです。
GitHub 上では見にくいですが、ローカルで見るとよく分かると思います。
他にあるかは確認していないですが。

Copy link
Member

@m-tmatma m-tmatma Jun 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

↑ 間違いです。
@kobake さんの
#147 (comment) が正しいです。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

時間がないのでまた後で

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

朝からお疲れ様です 🙏

#else
auto_sprintf( szMsg, _T("Ver. %d.%d.%d.%d (Rev.") _T(SVN_REV_STR) _T(")\r\n"),
HIWORD( dwVersionMS ),
LOWORD( dwVersionMS ),
HIWORD( dwVersionLS ),
LOWORD( dwVersionLS )
);
#endif
cmemMsg.AppendString( szMsg );

Expand Down
5 changes: 2 additions & 3 deletions sakura_lang_en_US/sakura_lang_rc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#ifndef SAKURA_LANG_RESOURCE
#include "sakura_rc.h"
#include "Funccode_define.h"
#include "svnrev.h"
#include "String_define.h"
#else
#include "sakura_lang.h"
Expand Down Expand Up @@ -2814,8 +2813,8 @@ BEGIN
VALUE "OriginalFilename", "sakura.exe\0"
VALUE "ProductName", "Sakura Editor Language DLL\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"
Expand Down