On Tue, Jan 22, 2002 at 07:10:16PM +0100, Jean-Marc Lasgouttes wrote: > >>>>> "Kayvan" == Kayvan A Sylvan <[EMAIL PROTECTED]> writes: > > Kayvan> Huh. > > Kayvan> I never had to do any of this to get it to compile and run on > Kayvan> Cygwin 1.3.6. > > Kayvan> I wonder what the difference is? > > Most of these patches are included in 1.2.0cvs. My intent is to have > all necessary stuff in 1.2.0.
Ah! Okay, that makes sense. I have only compiled in 1.2.0cvs under Cygwin/W2k. > We use libtool 1.3.4 in 1.1.6 and libtool 1.4 in 1.2.0cvs. This is > probably the source for the difference. Should I upgrade it? Well... Only if you intend to release another 1.1.6fix release. I think at some point we have to let the branch die. > >> ../Win32_116fix4.diff export LDFLAGS='-lregex -lintl' export > >> CXXFLAGS='-O2' export CFLAGS='-O2' ./autogen.sh ./configure > >> --prefix=/usr --datadir=/usr/share Uncommented #define HAVE_MKFIFO > >> 1 in src/config.h > > Maybe this is not needed anymore with latest cygwin (Claus, could you > check?). Otherwise, this could go to nt_defines.h. HAVE_MKFIFO is defined to 1 in my src/config.h, and it seems to work. > make install Furthermore I have manually moved > >> all lyx.mo files into /usr/share/locale/... because the default > >> location /usr/lib/locale will not be recognized by Cygwin > >> automatically! > > Kayvan, did this work with 1.2.0cvs? It might be that this is a > gettext bug fixed in 0.10.40 (in 1.2.0cvs). I'm not sure I want to > upgrade gettext for 1.1.6fix5 (which I would like to release to match > xforms 1.0.0). This worked in 1.2.0cvs, yes. > Now, to go over the patch a bit: [...] > > Everything is in, except for the two following entries. > > @@ -232,13 +233,13 @@ > // no checks for now > lyxerr[Debug::LATEX] << "Running BibTeX." << endl; > WriteStatus(minib, _("Running BibTeX.")); > - updateBibtexDependencies(head, bibtex_info); > +// CHH updateBibtexDependencies(head, bibtex_info); > rerun |= runBibTeX(bibtex_info); > } else if (!had_depfile) > /// If we run pdflatex on the file after running latex on it, > /// then we do not need to run bibtex, but we do need to > /// insert the .bib and .bst files into the .dep-pdf file. > - updateBibtexDependencies(head, bibtex_info); > +// CHH updateBibtexDependencies(head, bibtex_info); > > // 1 > // we know on this point that latex has been run once (or we just > > This is _not_ in. Claus, what is the problem with bibtex dependencies? > > @@ -632,10 +637,14 @@ > > string const logfile = OnlyFilename(ChangeExtension(file, ".log")); > > - LRegex reg1("\\)* *\\(([^ )]+).*"); > +// Claus Hentschel: Inserted curly brace in reg1 for correct pdf depency entry > + LRegex reg1("\\)* *\\(([^ ){]+).*"); > LRegex reg2("File: ([^ ]+).*"); > LRegex reg3("No file ([^ ]+)\\..*"); > LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*"); > +#ifdef __CYGWIN__ > + LRegex reg5("Writing index file ([^ ]+).*"); > +#endif > LRegex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$"); > > ifstream ifs(logfile.c_str()); > > The first one is not in, but the second is in. Could someone > investigate? I don't know what to look for... If you can help there, I can do the legwork. > > --- lyx-1.1.6fix4/src/buffer.C Tue Dec 18 10:29:00 2001 > +++ wlyx-1.1.6fix4/src/buffer.C Thu Jan 17 11:08:10 2002 > > Everything in. > > --- lyx-1.1.6fix4/src/insets/figinset.C Mon Jul 23 14:09:56 2001 > +++ wlyx-1.1.6fix4/src/insets/figinset.C Thu Jan 17 11:08:10 2002 > > Everything in, except for > > @@ -523,7 +524,11 @@ > > // create translation file > ofstream ofs; > - ofs.open(make_tmp(getpid()).c_str()); > +#ifdef __CYGWIN__ > + ofs.open(make_tmp(getpid()).c_str(), ios::binary); > +#else > + ofs.open(make_tmp(getpid()).c_str()); > +#endif > ofs << "gsave clippath pathbbox grestore\n" > << "4 dict begin\n" > << "/ury exch def /urx exch def /lly exch def " > > This looks like something we could do for unix too (should not hurt). > Comments? Should be harmless, yes. > Also, Kayvan, it would be nice to make sure that everything works with > teTeX. I believe Claus uses miktex. I use fpTeX, which is basically tetex, and it works for me. ---Kayvan -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
msg31957/pgp00000.pgp
Description: PGP signature