After update and compilation of Wine - version isn't changed

[Fazer]

I downloaded Wine sources using git-gui, compiled it and it worked great. Then I wanted to update it, so I run sudo make uninstall, then in git-gui I did remote - fetch from origin.

Then I did
./configure
make depend
make -j4
sudo make install

And when I checked the version with wine --version, it gave me the old one

wine-1.1.5-399-g82f77cc

instead of

wine-1.1.5-xxx-g3a2dda1

where "xxx" is number of commits since last release (I guess). The last commit is "msvcrt: Pass the command interpreter as exe name from _wpopen."

So did I make something wrong? Is my Wine up-to-date? What is the meaning of lif- whoops, wrong forum

Some time ago I had the same problem, but then I just erased all sources and downloaded them from scratch. I don't want to do this each time I update Wine.

Btw I'm on Ubuntu 8.04.

[vitamin]

I downloaded Wine sources using git-gui, compiled it and it worked great. Then I wanted to update it, so I run sudo make uninstall, then in git-gui I did remote - fetch from origin.

You should use either:

Code: Select all

git pull

Or

Code: Select all

git fetch; git rebase origin

Much more info about git you probably don't need: http://wiki.winehq.org/GitWine

[Fazer]

After doing "git fetch; git rebase origin" I got

Code: Select all

arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git fetch; git rebase origin
fatal: Needed a single revision
invalid upstream origin

After "git pull" I got

Code: Select all

arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either.  Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.master.remote = <nickname>
    branch.master.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.

I'm confused

[dimesio]

Code: Select all

git fetch ; git rebase origin

[vitamin]

After doing "git fetch; git rebase origin" I got

Code: Select all

arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git fetch; git rebase origin
fatal: Needed a single revision
invalid upstream origin

Looks like your git tree is screwed up a bit. Run this:

Code: Select all

git checkout -f master
git reset --hard origin

[Fazer]

Code: Select all

git fetch ; git rebase origin

Ok, that gave me something more, but also an error at the end:

arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git fetch ; git rebase origin
remote: Counting objects: 601, done.
remote: Compressing objects: 100% (79/79), done.
remote: Total 453 (delta 374), reused 453 (delta 374)
Receiving objects: 100% (453/453), 72.44 KiB | 41 KiB/s, done.
Resolving deltas: 100% (374/374), completed with 145 local objects.
From git://source.winehq.org/git/wine
e20ef50..19d18f0 master -> origin/master
fatal: Needed a single revision
invalid upstream origin

[Fazer]

After doing "git fetch; git rebase origin" I got

Code: Select all

arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git fetch; git rebase origin
fatal: Needed a single revision
invalid upstream origin

Looks like your git tree is screwed up a bit. Run this:

Code: Select all

git checkout -f master
git reset --hard origin

arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git checkout -f master
Already on branch "master"
arkadiusz@arkadiusz-hardy:~/Programy/wine-git -> git reset --hard origin
fatal: Failed to resolve 'origin' as a valid ref.

Still something is wrong?

[vitamin]

Still something is wrong?

How did you cloned your tree? It's a time to wipe it and re-do it right: http://www.winehq.org/site/git

[Fazer]

Still something is wrong?

How did you cloned your tree? It's a time to wipe it and re-do it right: http://www.winehq.org/site/git

As I stated in the first post, I downloaded Wine sources using git-gui.
But I'll try to clone them now using bash commands.

[Fazer]

Today I saw new commits merged into Wine tree, so I did as follows:

sudo make uninstall
git fetch
git rebase origin
./configure
make depend
make
sudo make install

Then I did wine --version and got a proper result:

wine-1.1.5-644-gfa6a31a

So it's pretty much solved. Btw, did I have to do "sudo make uninstall" and "sudo make install" to make it work right?

[dimesio]

So it's pretty much solved. Btw, did I have to do "sudo make uninstall" and "sudo make install" to make it work right?

If you actually install it, yes, you have to uninstall the old version first. If you just run it from the directory you compiled it in without installing, then no.

[austin987]

On Thu, Oct 9, 2008 at 9:54 AM, dimesio <[email protected]> wrote:

Fazer wrote:

So it's pretty much solved. Btw, did I have to do "sudo make uninstall" and "sudo make install" to make it work right?

If you actually install it, yes, you have to uninstall the old version first. If you just run it from the directory you compiled it in without installing, then no.

No. If you already installed it and do another make install, it'll
overwrite the old one, assuming you didn't use different install
prefixes or something screwy.

[dimesio]

No. If you already installed it and do another make install, it'll
overwrite the old one, assuming you didn't use different install
prefixes or something screwy.

Really? I seem to remember seeing more than one thread (besides this one) where the person had to uninstall the old version before the new one would install properly. (Though perhaps they all fell into the category of "something screwy.")

[austin987]

On Thu, Oct 9, 2008 at 3:25 PM, dimesio <[email protected]> wrote:

austin987 wrote:

No. If you already installed it and do another make install, it'll
overwrite the old one, assuming you didn't use different install
prefixes or something screwy.

Really? I seem to remember seeing more than one thread (besides this one) where the person had to uninstall the old version before the new one would install properly. (Though perhaps they all fell into the category of "something screwy.")

Assuming they both used the git source. If they had used some modified
wine source, installed that, then tried to install vanilla wine,
something screwy may happen. Or installing from a deb, then
overwriting with a source install, etc.