On Sun, Sep 10, 2006 at 10:26:18PM +0200, Lars Gullik Bjønnes wrote:
> Enrico Forestieri <[EMAIL PROTECTED]> writes:
>
> | On Sun, Sep 10, 2006 at 08:26:02PM +0200, Lars Gullik Bjønnes wrote:
> |
> | > Enrico Forestieri <[EMAIL PROTECTED]> writes:
> | >
> | > | On Sun, Sep 10, 2006 at 01:18:56AM +0200, Lars Gullik Bjønnes wrote:
> | > |
> | > | >
> | > | > This patch tries to simplify the code a bit. Further installments in
> | > | > progress.
> | > | >
> | > | > This works for me, but I'd be happy if someone else also took the time
> | > | > to test it. Especially windows people.
> | > |
> | > | Sorry, but I have a problem compiling LyX (not related to this patch,
> | > | but I cannot test).
> | > |
> | > | if g++ -DHAVE_CONFIG_H -I. -I../../src -I. -I../../boost
> -Wno-uninitialized -
> | > | O2 -MT buffer.o -MD -MP -MF ".deps/buffer.Tpo" -c -o buffer.o
> | > | ../../src/buffer.C
> | >
> | > Hmm... this is not the compile command as given by automake? Have you
> | > changed it?
> |
> | No, I have not changed it. I have always seen the compile command that
> | way...
>
> Just a tiny bit?
>
> -Wno-uninitialized is not something we set.
Oh, that one. I legally set that option through CPPFLAGS to avoid tons
of bogus warnings. I thought you meant the "if ..." form of the command.
With the attached patch I am able to compile but then:
$ ./src/lyx
Same as entered returned
Unable to determine the path to the LyX binary from the command line ./src/lyx
This must be some gcc bug (it is gcc 3.4.4). I'll have a look at it in
the next days when I find some time.
--
Enrico
Index: src/lyx_cb.C
===================================================================
--- src/lyx_cb.C (revision 14966)
+++ src/lyx_cb.C (working copy)
@@ -67,7 +67,6 @@ using lyx::support::makeAbsPath;
using lyx::support::makeDisplayPath;
using lyx::support::onlyFilename;
using lyx::support::onlyPath;
-using lyx::support::Path;
using lyx::support::package;
using lyx::support::removeAutosaveFile;
using lyx::support::rename;
@@ -443,7 +442,7 @@ void reconfigure(BufferView * bv)
bv->buffer()->message(lyx::to_utf8(_("Running configure...")));
// Run configure in user lyx directory
- Path p(package().user_support());
+ lyx::support::Path p(package().user_support());
string const configure_command = package().configure_command();
Systemcall one;
one.startscript(Systemcall::Wait, configure_command);
Index: src/buffer.C
===================================================================
--- src/buffer.C (revision 14966)
+++ src/buffer.C (working copy)
@@ -113,7 +113,6 @@ using lyx::support::makeDisplayPath;
using lyx::support::makeLatexName;
using lyx::support::onlyFilename;
using lyx::support::onlyPath;
-using lyx::support::Path;
using lyx::support::quoteName;
using lyx::support::removeAutosaveFile;
using lyx::support::rename;
@@ -1075,7 +1074,7 @@ int Buffer::runChktex()
string const path = temppath();
string const org_path = filePath();
- Path p(path); // path to LaTeX file
+ lyx::support::Path p(path); // path to LaTeX file
message(lyx::to_utf8(_("Running chktex...")));
// Generate the LaTeX file if neccessary
Index: src/lyxfunc.C
===================================================================
--- src/lyxfunc.C (revision 14966)
+++ src/lyxfunc.C (working copy)
@@ -118,7 +118,6 @@ using lyx::support::isStrInt;
using lyx::support::makeAbsPath;
using lyx::support::makeDisplayPath;
using lyx::support::package;
-using lyx::support::Path;
using lyx::support::quoteName;
using lyx::support::rtrim;
using lyx::support::split;
@@ -931,7 +930,7 @@ void LyXFunc::dispatch(FuncRequest const
// Push directory path.
string const path = buffer->temppath();
- Path p(path);
+ lyx::support::Path p(path);
// there are three cases here:
// 1. we print to a file
@@ -1346,7 +1345,7 @@ void LyXFunc::dispatch(FuncRequest const
}
case LFUN_PREFERENCES_SAVE: {
- Path p(package().user_support());
+ lyx::support::Path p(package().user_support());
lyxrc.write("preferences", false);
break;
}
Index: src/vc-backend.C
===================================================================
--- src/vc-backend.C (revision 14966)
+++ src/vc-backend.C (working copy)
@@ -30,7 +30,6 @@ using lyx::support::addPath;
using lyx::support::contains;
using lyx::support::onlyFilename;
using lyx::support::onlyPath;
-using lyx::support::Path;
using lyx::support::quoteName;
using lyx::support::rtrim;
using lyx::support::split;
@@ -57,7 +56,7 @@ int VCS::doVCCommand(string const & cmd,
{
lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
Systemcall one;
- Path p(path);
+ lyx::support::Path p(path);
int const ret = one.startscript(Systemcall::Wait, cmd);
return ret;
}
Index: src/lyx_main.C
===================================================================
--- src/lyx_main.C (revision 14966)
+++ src/lyx_main.C (working copy)
@@ -71,7 +71,6 @@ using lyx::support::getEnv;
using lyx::support::i18nLibFileSearch;
using lyx::support::libFileSearch;
using lyx::support::package;
-using lyx::support::Path;
using lyx::support::prependEnvPath;
using lyx::support::rtrim;
using lyx::support::Systemcall;
@@ -131,7 +130,7 @@ void reconfigureUserLyXDir()
string const configure_command = package().configure_command();
lyxerr << lyx::to_utf8(_("LyX: reconfiguring user directory")) << endl;
- Path p(package().user_support());
+ lyx::support::Path p(package().user_support());
Systemcall one;
one.startscript(Systemcall::Wait, configure_command);
lyxerr << "LyX: " << lyx::to_utf8(_("Done!")) << endl;
