process of updating wine i run today was quite ordinary: [s2@localhost wine]$ cd wine; make distclean; cd .. [s2@localhost wine]$ cat ./run #!/bin/bash export CVSROOT=:pserver:cvs@cvs.winehq.com:/home/wine #export CVSROOT=:pserver:cvs@rhlx01.fht-esslingen.de:/home/wine cvs login cvs update -PAd [s2@localhost wine]$ ./run <skipped /> [s2@localhost wine]$ tools/wineinstall <skipped /> make[2]: Leaving directory `/usr/src/wine-cvs-commit/wine/dlls/ntdll' make[2]: Entering directory `/usr/src/wine-cvs-commit/wine/dlls/kernel' LD_LIBRARY_PATH="../../libs/unicode:$LD_LIBRARY_PATH" ../../tools/wrc/wrc -o version16.res -O res16 ./version16.rc ./version16.rc:23:1: Error: Unable to open include file wine/wine_common_ver.rc make[2]: *** [version16.res] Error 1 make[2]: Leaving directory `/usr/src/wine-cvs-commit/wine/dlls/kernel' make[1]: *** [kernel] Error 2 make[1]: Leaving directory `/usr/src/wine-cvs-commit/wine/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. AFAICS i am getting into trouble. is it my fault? what am i doing wrong?
Saulius Krasuckas wrote:> process of updating wine i run today was quite ordinary: > > [s2@localhost wine]$ cd wine; make distclean; cd ..I'll admit that first line does not look "quite ordinary" to me. What is going on there? The rest looks ok, though I have not tried to compile the CVS Wine in a few days.
> I'll admit that first line does not look "quite ordinary" to me. What > is going on there? The rest looks ok, though I have not tried to > compile the CVS Wine in a few days.(oops, I forgot to copy-paste one command i run berfore "tools/wineinstall". it was "cd wine") now all the story: I got "full-cvs-2003-05-04.tar.gz" and extracted it to /usr/src. got directory "wine-cvs-commit". after, I made a symlink to it named "wine": [s2@localhost wine]$ ll /usr/src | grep -i wine lrwxrwxrwx 1 s2 s2 16 May 5 15:29 wine -> wine-cvs-commit/ drwxrwsr-x 10 s2 s2 4096 May 5 16:17 wine-cvs-commit [s2@localhost wine]$ pwd /usr/src/wine [s2@localhost wine]$ ll total 40 drwxrwsr-x 4 s2 s2 4096 Apr 27 08:23 bak drwxrwsr-x 7 s2 s2 4096 Dec 12 2000 c2man drwxrwsr-x 4 s2 s2 4096 May 4 04:33 CVSROOT drwxrwsr-x 6 s2 s2 4096 Feb 28 2001 kernel-win32 drwxrwsr-x 7 s2 s2 4096 Apr 14 17:53 lostwages -rwxr--r-- 1 s2 s2 156 May 8 13:00 run -rw-r--r-- 1 s2 s2 48 May 5 16:17 run2 drwxrwxr-x 4 s2 s2 4096 Dec 12 2000 test drwxrwsr-x 3 s2 s2 4096 May 5 05:00 tools drwxrwsr-x 36 s2 s2 4096 May 11 17:28 wine [s2@localhost wine]$ cd wine; ll | tail drwxrwsr-x 15 s2 s2 4096 May 11 17:29 tools drwxrwsr-x 4 s2 s2 4096 May 5 16:13 tsx11 drwxrwsr-x 4 s2 s2 4096 May 5 16:13 unicode -rw-r--r-- 1 s2 s2 22 Apr 9 01:37 VERSION -r--r--r-- 1 s2 s2 3089 Apr 9 01:39 VERSION,v drwxrwsr-x 4 s2 s2 4096 May 11 17:37 win32 drwxrwsr-x 6 s2 s2 4096 May 11 14:57 windows lrwxrwxrwx 1 s2 s2 19 May 11 17:28 wine -> ./tools/winewrapper -rw-r--r-- 1 s2 s2 147934 May 2 23:21 winedefault.reg -r--r--r-- 1 s2 s2 187666 May 2 23:21 winedefault.reg,v this is place I am running "cd wine; make distclean; cd .." and after "./run; cd wine; tools/wineinstall". if even I had read once it, have forgotten already: is it bad to do such jumping between main CVS-dir and wine-code sub-dir?
Saulius Krasuckas wrote:> process of updating wine i run today was quite ordinary: > > [s2@localhost wine]$ cd wine; make distclean; cd .. > [s2@localhost wine]$ cat ./run > #!/bin/bash > export CVSROOT=:pserver:cvs@cvs.winehq.com:/home/wine > #export CVSROOT=:pserver:cvs@rhlx01.fht-esslingen.de:/home/wine > cvs login > cvs update -PAd > [s2@localhost wine]$ ./run > <skipped /> > [s2@localhost wine]$ tools/wineinstall > <skipped /> > make[2]: Leaving directory `/usr/src/wine-cvs-commit/wine/dlls/ntdll' > make[2]: Entering directory `/usr/src/wine-cvs-commit/wine/dlls/kernel' LD_LIBRARY_PATH="../../libs/unicode:$LD_LIBRARY_PATH" ../../tools/wrc/wrc -o version16.res -O res16 ./version16.rc ./version16.rc:23:1: Error: Unable to open include file wine/wine_common_ver.rc > make[2]: *** [version16.res] Error 1Ok, another odd thing. I have no "version16" anything, anywhere in my Wine distribution.
Saulius Krasuckas wrote:> > ok. today, when my patience and faith were over I made new dir, and run > "cvs checkout". then I run "tools/wineinstall" and: > > [s2@localhost src]$ diff -u wine-cvs-commit_old/wine/dlls/kernel/Makefile > cvs-commit/wine/dlls/kernel/Makefile > --- wine-cvs-commit_old/wine/dlls/kernel/Makefile 2003-05-12 > 17:06:50.000000000 +0200 > +++ cvs-commit/wine/dlls/kernel/Makefile 2003-05-12 > 18:46:40.000000000 +0200 > @@ -445,295 +445,6 @@ > $(WINEBUILD) $(DEFS) -o $@ --dll-name kernel --main-module > $(MODULE) --res version16.res --spec $(SRCDIR)/krnl386.exe.spec > > version16.res: version16.rc > - $(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/version16.rc > + $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc > ... > > does it bring some (clearness|clarity) ? how do you think, what has > changed to initiate generation of such a differences between "Makefiles"? >That was a change in CVS on May 6: http://cvs.winehq.com/patch.py?root=/home/winehq/opt/cvs-commit&id=8047 So maybe when you did a CVS update, for some reason that file was missed?
Duane Clark wrote:> > That was a change in CVS on May 6: > http://cvs.winehq.com/patch.py?root=/home/winehq/opt/cvs-commit&id=8047 > > So maybe when you did a CVS update, for some reason that file was > missed?thanks a lot, Duane, although i am giving up upon this. just out of curiosity: how did you find patch so quick :-?
Saulius Krasuckas wrote:> Duane Clark wrote: > >>That was a change in CVS on May 6: >>http://cvs.winehq.com/patch.py?root=/home/winehq/opt/cvs-commit&id=8047 >> >>So maybe when you did a CVS update, for some reason that file was >>missed? > > > thanks a lot, Duane, although i am giving up upon this. just out of > curiosity: how did you find patch so quick :-?It was a difference in the Makefile, and the "source" for Makefile is Makefile.in. So I went to my Wine source directory and typed: cvs log dlls/kernel/Makefile.in Near the beginning of the output from that was: revision 1.65 date: 2003/05/06 18:34:53; author: julliard; state: Exp; lines: +1 -1 Dimitrie O. Paun <dpaun@rogers.com> Make it easy to use something other than wrc to compile resources.