ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use build date on openSUSE. 

Fixes RPMLINT warning:
pcsx2.i586: W: file-contains-date-and-time /usr/bin/pcsx2
Your file uses  __DATE and __TIME__ this causes the package to rebuild when not needed
This commit is contained in:
Johannes Obermayr 2014-09-17 22:36:44 +02:00
parent 7b1d3ba7ea
commit 9fd2f3dd8a
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Pcsx2Utils.cmake
View File

@ -26,6 +26,7 @@ function(detectOperatingSystem)
endif() endif()
if ("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$") if ("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$")
set(openSUSE TRUE PARENT_SCOPE) set(openSUSE TRUE PARENT_SCOPE)
add_definitions(-DopenSUSE)
message(STATUS "Build openSUSE specific") message(STATUS "Build openSUSE specific")
endif() endif()
endif() endif()

14
pcsx2/System.cpp
View File

@ -194,14 +194,20 @@ void SysLogMachineCaps()
{ {
if ( !PCSX2_isReleaseVersion ) if ( !PCSX2_isReleaseVersion )
{ {
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld %s - compiled on " __DATE__, Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld %s"
PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, #ifndef openSUSE
"- compiled on " __DATE__
#endif
, PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
SVN_REV, SVN_MODS ? "(modded)" : "" SVN_REV, SVN_MODS ? "(modded)" : ""
); );
} }
else { // shorter release version string else { // shorter release version string
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld - compiled on " __DATE__, Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld"
PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, #ifndef openSUSE
"- compiled on " __DATE__
#endif
, PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
SVN_REV ); SVN_REV );
} }

5
pcsx2/gui/MainFrame.cpp
View File

@ -356,8 +356,13 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
else else
{ {
// beta / development editions, which feature revision number and compile date. // beta / development editions, which feature revision number and compile date.
#ifndef openSUSE
wintitle.Printf( L"%s %d.%d.%d-%lld%s (git) %s", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, wintitle.Printf( L"%s %d.%d.%d-%lld%s (git) %s", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
SVN_REV, SVN_MODS ? L"m" : wxEmptyString, fromUTF8(__DATE__).c_str() ); SVN_REV, SVN_MODS ? L"m" : wxEmptyString, fromUTF8(__DATE__).c_str() );
#else
wintitle.Printf( L"%s %d.%d.%d-%lld%s (git)", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
SVN_REV, SVN_MODS ? L"m" : wxEmptyString );
#endif
} }
SetTitle( wintitle ); SetTitle( wintitle );

13
plugins/spu2-x/src/Windows/AboutBox.cpp
View File

@ -32,10 +32,17 @@ static LRESULT WINAPI AboutProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
wchar_t outstr[256]; wchar_t outstr[256];
if( IsDevBuild ) if( IsDevBuild )
swprintf_s( outstr, L"Build %lld -- Compiled on " _T(__DATE__), SVN_REV ); swprintf_s( outstr, L"Build %lld"
#ifndef openSUSE
"-- Compiled on " _T(__DATE__)
#endif
, SVN_REV );
else else
swprintf_s( outstr, L"Release v%d.%d -- Compiled on " _T(__DATE__), swprintf_s( outstr, L"Release v%d.%d"
VersionInfo::Release, VersionInfo::Revision ); #ifndef openSUSE
"-- Compiled on " _T(__DATE__)
#endif
, VersionInfo::Release, VersionInfo::Revision );
SetWindowText( GetDlgItem(hDlg, IDC_LABEL_VERSION_INFO), outstr ); SetWindowText( GetDlgItem(hDlg, IDC_LABEL_VERSION_INFO), outstr );
ShowWindow( hDlg, true ); ShowWindow( hDlg, true );