Re: [PATCH] Fix make distclean
Am 29.09.2013 um 22:24 schrieb Vincent van Ravesteijn : > Op 29-9-2013 22:16, Stephan Witt schreef: >> Am 29.09.2013 um 21:48 schrieb Pavel Sanda : >> >>> Stephan Witt wrote: I cannot imagine how a "rm -f" can fail, so the leading minus is not needed. >>> If DEPDIR doesn't exists it will fail. P >> No. It will not fail. That's the effect of "-f". >> >> Stephan > > I copied it from Makefile.in, so I guess it will be ok to leave it there, > whether it can or cannot fail in practice. Yes, of course. Stephan
Re: [PATCH] Fix make distclean
Op 29-9-2013 22:16, Stephan Witt schreef: Am 29.09.2013 um 21:48 schrieb Pavel Sanda : Stephan Witt wrote: I cannot imagine how a "rm -f" can fail, so the leading minus is not needed. If DEPDIR doesn't exists it will fail. P No. It will not fail. That's the effect of "-f". Stephan I copied it from Makefile.in, so I guess it will be ok to leave it there, whether it can or cannot fail in practice. Vincent
Re: [PATCH] Fix make distclean
Stephan Witt wrote: > No. It will not fail. That's the effect of "-f". You are right, I used force flag for completely different reasons up to now ;) P
Re: [PATCH] Fix make distclean
Am 29.09.2013 um 21:48 schrieb Pavel Sanda : > Stephan Witt wrote: >> I cannot imagine how a "rm -f" can fail, so the leading minus is not needed. > > If DEPDIR doesn't exists it will fail. P No. It will not fail. That's the effect of "-f". Stephan
Re: [PATCH] Fix make distclean
Stephan Witt wrote: > I cannot imagine how a "rm -f" can fail, so the leading minus is not needed. If DEPDIR doesn't exists it will fail. P
Re: [PATCH] Fix make distclean
Am 29.09.2013 um 21:00 schrieb Vincent van Ravesteijn : > This only cleans the .deps directories that won't be needed later on. > --- > > This fixes it for me. Any comments on this ? This looks ok. Removing things outside the current directory isn't good, IMO. I cannot imagine how a "rm -f" can fail, so the leading minus is not needed. Stephan > src/support/Makefile.am |4 > src/tex2lyx/Makefile.am |4 > 2 files changed, 8 insertions(+) > > diff --git a/src/support/Makefile.am b/src/support/Makefile.am > index 708d19d..e82761d 100644 > --- a/src/support/Makefile.am > +++ b/src/support/Makefile.am > @@ -30,6 +30,10 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES) > AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) > AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_INCLUDES) > > +distclean: distclean-am > + -rm -rf ./$(DEPDIR) linkback/$(DEPDIR) mythes/$(DEPDIR) > + -rm -f Makefile > + > liblyxsupport_a_SOURCES = \ > FileMonitor.h \ > FileMonitor.cpp \ > diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am > index 0aa887e..4388054 100644 > --- a/src/tex2lyx/Makefile.am > +++ b/src/tex2lyx/Makefile.am > @@ -66,6 +66,10 @@ alltests-recursive: tex2lyx > updatetests: tex2lyx > $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx > "$(top_srcdir)/lib/scripts" "$(srcdir)/test" > > +distclean: distclean-am > + -rm -rf ./$(DEPDIR) > + -rm -f Makefile > + > LINKED_FILES = \ > ../Author.cpp \ > ../Color.cpp \ > -- > 1.7.9.5 >
[PATCH] Fix make distclean
This only cleans the .deps directories that won't be needed later on. --- This fixes it for me. Any comments on this ? Vincent src/support/Makefile.am |4 src/tex2lyx/Makefile.am |4 2 files changed, 8 insertions(+) diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 708d19d..e82761d 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -30,6 +30,10 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES) AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_INCLUDES) +distclean: distclean-am + -rm -rf ./$(DEPDIR) linkback/$(DEPDIR) mythes/$(DEPDIR) + -rm -f Makefile + liblyxsupport_a_SOURCES = \ FileMonitor.h \ FileMonitor.cpp \ diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 0aa887e..4388054 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -66,6 +66,10 @@ alltests-recursive: tex2lyx updatetests: tex2lyx $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test" +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + LINKED_FILES = \ ../Author.cpp \ ../Color.cpp \ -- 1.7.9.5
Re: Make distclean failure
Op 17-8-2013 11:38, Jürgen Spitzmüller schreef: It stops at .deps/AppleSpellChecker.Po and other .deps/*.Po which are unknown. Jürgen The culprit seems to be the following line in the output of "make distclean": rm -rf ../.deps ../graphics/.deps ../insets/.deps .deps while being in the directory src/tex2lyx. This means that when we continue, we suddenly miss the .deps directories. Vincent
Re: Make distclean failure
Op 29-9-2013 18:50, Jürgen Spitzmüller schreef: Vincent van Ravesteijn wrote: This still fails for me. Is anyone around who knows how to fix this ? Last time, removing subdir-objects from AM_INIT_AUTOMAKE in configure.ac helped. Jürgen Well, I just added this again. So.. does this mean we have to remove it .. again ? Vincent
Re: trunk: Style Chunk
On 09/25/2013 03:15 PM, Scott Kostyshak wrote:
On Tue, Sep 10, 2013 at 6:26 PM, Scott Kostyshak wrote:
On Tue, Sep 10, 2013 at 3:09 PM, Richard Heck wrote:
On 09/10/2013 11:51 AM, Scott Kostyshak wrote:
On Tue, Aug 20, 2013 at 7:43 PM, Richard Heck wrote:
I wrote the lyx2lyx stuff to do this, so if you can post an example that
doesn't convert, I'll fix it.
The examples are: lib/examples/{Literate,listerrors,noweb2lyx}.lyx
Would it help if I cut them down to the part that shows the problem?
If so, I should do that for the 2.0.x format (before they're
converted) right? Or would it be better to see the chunks that failed
to convert (that is, after the conversion)?
Sorry, very busy with the start of the semester here. But yes, the most
minimal version you can provide would help a lot. And yes, for 2.0.x.
Richard
Attached are cut-down examples. Let me know if there's anything else I can do.
Richard, I know you don't have much time. Should we just remove these
files for 2.1? Another option is to manually fix them (that is just do
the lyx2lyx manually). I could try to do that, but I don't understand
these files well.
I will look at this in the coming week. Promise.
Richard
Re: [PATCH] InsetTabular: add a layoutName method
On 09/29/2013 10:53 AM, Jean-Marc Lasgouttes wrote: Le 28/09/13 22:56, Scott Kostyshak a écrit : Ah, you mean that something could go wrong if someone tries to define an inset with a name that already exists? Do we check for this? Is inset-forall the only place where there could be such a problem? No, what happens now is that InsetLayout can change the way tabulars are displayed or their LaTeX output. In general it is nice (for example one can do nice tricks with branches this way), but it can give surprising results. In this case, though, I tend to think that there is no problem. And a nice way to find out is to enable it :) Mostly, I was curious whether enabling the use of InsetLayout in this way would allow useful things to be done. Perhaps in some later iteration it would be possible, e.g., to set default borders this way (a common request). Richard
Re: Make distclean failure
Vincent van Ravesteijn wrote: > This still fails for me. > > Is anyone around who knows how to fix this ? Last time, removing subdir-objects from AM_INIT_AUTOMAKE in configure.ac helped. Jürgen
Re: Make distclean failure
Op 17-8-2013 11:38, Jürgen Spitzmüller schreef: It stops at .deps/AppleSpellChecker.Po and other .deps/*.Po which are unknown. Jürgen This still fails for me. Is anyone around who knows how to fix this ? Vincent
Re: Lyx2.1.0beta2 issues ?
Op 27-9-2013 23:53, Stephan Witt schreef: Regarding the details: * BufferEncoding.cpp is a manual copy of Encoding.cpp - that's why the wrong comment - that's why the name of the file - that's why the superfluous includes * CharInfo was a private struct - I've made a class to make it more functional but didn't want to make it public - It should be used inside Encoding(s) only - Yes, one can move it to a separate public class with header file - Yes, that's why the static methods in Encoding.cpp … Who is we? Well, I have no other choice than to fix this myself in the coming days and to prepare the release of beta 2 in the weekend, or to reject this branch for now and prepare the release of beta 2. I did it myself. Thank you, I've merged the branch now, after that I splitted and merged some commits in more logical building blocks. At least what seemed logical in my opinion. You will have to cherry-pick the commit "use com.apple.compilers.llvm.clang.1_0 for newer Xcode versions" yourself, because it didn't seem to be related to killing the TEX2LYX define. Vincent
Re: [PATCH] InsetTabular: add a layoutName method
Le 28/09/13 22:56, Scott Kostyshak a écrit : Ah, you mean that something could go wrong if someone tries to define an inset with a name that already exists? Do we check for this? Is inset-forall the only place where there could be such a problem? No, what happens now is that InsetLayout can change the way tabulars are displayed or their LaTeX output. In general it is nice (for example one can do nice tricks with branches this way), but it can give surprising results. In this case, though, I tend to think that there is no problem. And a nice way to find out is to enable it :) JMard
