summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4066fca)
These are now in version.cpp. The build machinery should therefore make sure
that version.cpp is recompiled at every compilation.
These variables are now referred to by the other places that made use of __DATE__ and __TIME__.
cout << to_utf8(_(" Git commit hash "))
<< string(lyx_git_commit_hash).substr(0,8) << endl;
cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
cout << to_utf8(_(" Git commit hash "))
<< string(lyx_git_commit_hash).substr(0,8) << endl;
cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
- from_ascii(__DATE__), from_ascii(__TIME__))) << endl;
+ from_ascii(lyx_build_date), from_ascii(lyx_build_time))) << endl;
cout << lyx_version_info << endl;
exit(0);
return 0;
cout << lyx_version_info << endl;
exit(0);
return 0;
out << qt_(" Git commit hash ")
<< QString(lyx_git_commit_hash).left(8) << endl;
out << toqstr(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
out << qt_(" Git commit hash ")
<< QString(lyx_git_commit_hash).left(8) << endl;
out << toqstr(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
- from_ascii(__DATE__), from_ascii(__TIME__))) << endl;
+ from_ascii(lyx_build_date), from_ascii(lyx_build_time))) << endl;
out << lyx_version_info << endl;
return res;
out << lyx_version_info << endl;
return res;
DEFAULT_INCLUDES =
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
DEFAULT_INCLUDES =
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
- -I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
+ -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
+ $(BOOST_INCLUDES)
TEST_FILES = \
test/runtests.cmake \
TEST_FILES = \
test/runtests.cmake \
int parse_help(string const &, string const &)
{
int parse_help(string const &, string const &)
{
- cerr << "Usage: tex2lyx [options] infile.tex [outfile.lyx]\n"
+ cout << "Usage: tex2lyx [options] infile.tex [outfile.lyx]\n"
"Options:\n"
"\t-c textclass Declare the textclass.\n"
"\t-m mod1[,mod2...] Load the given modules.\n"
"Options:\n"
"\t-c textclass Declare the textclass.\n"
"\t-m mod1[,mod2...] Load the given modules.\n"
int parse_version(string const &, string const &)
{
int parse_version(string const &, string const &)
{
- lyxerr << "tex2lyx " << lyx_version
- << " (" << lyx_release_date << ")" << endl;
- lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
+ cout << "tex2lyx " << lyx_version
+ << " (" << lyx_release_date << ")" << endl;
+ cout << "Built on " << lyx_build_date << ", " << lyx_build_time
+ << endl;
- lyxerr << lyx_version_info << endl;
+ cout << lyx_version_info << endl;
///
extern char const * const lyx_release_date = LYX_DATE;
///
extern char const * const lyx_release_date = LYX_DATE;
+///
+extern char const * const lyx_build_date = __DATE__;
+///
+extern char const * const lyx_build_time = __TIME__;
+
/// Package identifier (lyx[-<version-suffix>])
extern char const * const lyx_package = PACKAGE;
/// Package identifier (lyx[-<version-suffix>])
extern char const * const lyx_package = PACKAGE;
extern char const * const lyx_git_commit_hash;
///
extern char const * const lyx_release_date;
extern char const * const lyx_git_commit_hash;
///
extern char const * const lyx_release_date;
+///
+extern char const * const lyx_build_date;
+///
+extern char const * const lyx_build_time;
/// Package identifier (lyx[-<version-suffix>])
extern char const * const lyx_package;
/// Package identifier (lyx[-<version-suffix>])
extern char const * const lyx_package;