Skip to content

Commit

Permalink
avoid putting __DATE__ or __TIME__ in release builds
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Oct 18, 2016
1 parent 773d365 commit eacb6df
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
5 changes: 4 additions & 1 deletion Engine/CLArgs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,10 @@ CLArgsPrivate::parse()
{
QStringList::iterator it = hasToken( QString::fromUtf8("version"), QString::fromUtf8("v") );
if ( it != args.end() ) {
QString msg = tr("%1 version %2 at commit %3 on branch %4 built on %4").arg( QString::fromUtf8(NATRON_APPLICATION_NAME) ).arg( QString::fromUtf8(NATRON_VERSION_STRING) ).arg( QString::fromUtf8(GIT_COMMIT) ).arg( QString::fromUtf8(GIT_BRANCH) ).arg( QString::fromUtf8(__DATE__) );
QString msg = tr("%1 version %2 at commit %3 on branch %4").arg( QString::fromUtf8(NATRON_APPLICATION_NAME) ).arg( QString::fromUtf8(NATRON_VERSION_STRING) ).arg( QString::fromUtf8(GIT_COMMIT) ).arg( QString::fromUtf8(GIT_BRANCH) );
# if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
msg += tr(" built on %1").arg( QString::fromUtf8(__DATE__) );
# endif
std::cout << msg.toStdString() << std::endl;
error = 1;

Expand Down
12 changes: 6 additions & 6 deletions Gui/AboutWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,14 @@ AboutWindow::AboutWindow(QWidget* parent)
}
}
#endif
QString gitStr = ( tr("<p>This software was compiled on %3 from the source "
"code branch %1 at version %2 using %4 targetting %5 for %6.</p>")
QString gitStr = ( tr("<p>This software was compiled from the source "
"code branch %1 at version %2 using %3 targetting %4 for %5.</p>")
.arg( QString::fromUtf8("<a href=\"https://github.com/MrKepzie/Natron/tree/"GIT_BRANCH "\">"GIT_BRANCH "</a>") ) // %1
.arg(argStr) // %2
.arg( QString::fromUtf8(__DATE__) ) // %3
.arg( QString::fromUtf8(BOOST_COMPILER OPENMP_STRING) ) // %4
.arg( QString::fromUtf8(BOOST_ARCH_NAME) ) // %5
.arg(osVer) );// %6
.arg( QString::fromUtf8(BOOST_COMPILER OPENMP_STRING) ) // %3
.arg( QString::fromUtf8(BOOST_ARCH_NAME) ) // %4
.arg(osVer) );// %5

aboutText.append(gitStr);
}
if ( !std::string(IO_GIT_COMMIT).empty() ) {
Expand Down
16 changes: 10 additions & 6 deletions Gui/SplashScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,20 @@ SplashScreen::SplashScreen(const QString & filePath)
if ( QString::fromUtf8(NATRON_DEVELOPMENT_STATUS) == QString::fromUtf8(NATRON_DEVELOPMENT_RELEASE_CANDIDATE) ) {
buildNo = QString::number(NATRON_BUILD_NUMBER);
}
_versionString = tr("v%1 - %2 %3 - built on %4")
_versionString = tr("v%1 - %2 %3")
.arg( QString::fromUtf8(NATRON_VERSION_STRING) )
.arg( QString::fromUtf8(NATRON_DEVELOPMENT_STATUS) )
.arg(buildNo)
.arg( QString::fromUtf8(__DATE__) );
.arg(buildNo);
# if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
_versionString += QString::fromUtf8(" - ") + tr("built on %1").arg( QString::fromUtf8(__DATE__) );
# endif
} else {
_versionString = tr("%1 for %2 - built on %3")
_versionString = tr("%1 for %2")
.arg( QString::fromUtf8(NATRON_APPLICATION_NAME) )
.arg(customBuildString)
.arg( QString::fromUtf8(__DATE__) );
.arg(customBuildString);
# if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
_versionString += QString::fromUtf8(" - ") + tr("built on %1").arg( QString::fromUtf8(__DATE__) );
# endif
}

setAttribute( Qt::WA_TransparentForMouseEvents );
Expand Down

0 comments on commit eacb6df

Please sign in to comment.