How to build an old version of LibO

classic Classic list List threaded Threaded
12 messages Options
Laurent BP Laurent BP
Reply | Threaded
Open this post in threaded view
|

How to build an old version of LibO

Hi,

I've trouble with git. I'd like to build a version of LibO 4-2 (~ October 2013).
I switched to my local branch of libreoffice-4-2 (git checkout libreoffice-4-2) then launched gitk, selected the commit where I want to come back, right clicked > Reinit libreoffice-4-2 branch to this state, selected "hard" reinitialisation. Then I made a "make" but the build version is a fresh 4.3 master :(
make distclean and restart the process did not change anything.
Where did I make a mistake?

Thanks for your help.
LibreOffice 5.3.5
Bjoern Michaelsen Bjoern Michaelsen
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

Hi Laurent,

On Wed, Apr 30, 2014 at 04:51:21AM -0700, Laurent BP wrote:
> I switched to my local branch of libreoffice-4-2 (git checkout
> libreoffice-4-2) then launched gitk, selected the commit where I want to
> come back, right clicked > Reinit libreoffice-4-2 branch to this state,
> selected "hard" reinitialisation. Then I made a "make" but the build version
> is a fresh 4.3 master :(

What do:

> git log -1

and:

> git status

return?

Best, Bjoern
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Laurent BP Laurent BP
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

Thanks for your reply.
Bjoern Michaelsen wrote
What do:

> git log -1
It returns the commit where I wanted to return.

Bjoern Michaelsen wrote
and:

> git status
# Sur la branche libreoffice-4-2
# Votre branche est en retard sur 'origin/libreoffice-4-2' de 4607 commits, et peut être mise à jour en avance rapide.
#   (utilisez "git pull" pour mettre à jour votre branche locale)
#
# Fichiers non suivis:
#   (utilisez "git add <fichier>..." pour inclure dans ce qui sera validé)
#
#       external/tarballs/
#       ios/lo.xcconfig
#
# L'énumération des fichiers non suivis a duré 3.46 secondes. 'status -uno'
# peut l'accélerer, mais vous devez alors faire attention à ne pas
# oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help status').
aucune modification ajoutée à la validation mais des fichiers non suivis sont présents (utilisez "git add" pour les suivre)

However About box when I launch libo returns
Version: 4.3.0.0.alpha1+
Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa

Laurent BP
LibreOffice 5.3.5
Christian Lohmaier-3 Christian Lohmaier-3
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

In reply to this post by Laurent BP
Hi Laurent, *,

On Wed, Apr 30, 2014 at 1:51 PM, Laurent BP <[hidden email]> wrote:
>
> I've trouble with git. I'd like to build a version of LibO 4-2 (~ October
> 2013).
> I switched to my local branch of libreoffice-4-2 (git checkout
> libreoffice-4-2) then launched gitk, selected the commit where I want to
> come back, right clicked > Reinit libreoffice-4-2 branch to this state,
> selected "hard" reinitialisation.

Hmm. I wouldn't do that (as I don't know what that would do), instead I'd do a

git checkout -b myoldlibreofficebranch whatevergitcommityoupicked

That should do the trick.

>  Then I made a "make" but the build version
> is a fresh 4.3 master :(
> make distclean and restart the process did not change anything.
> Where did I make a mistake?

No idea what gitk does when using those commands, so best is to look
what your git thinks it is working with (like Björn mentioned).

btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-)

ciao
Christian
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Christian Lohmaier-3 Christian Lohmaier-3
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

In reply to this post by Laurent BP
Hi Laurent,

2014-04-30 14:15 GMT+02:00 Laurent BP <[hidden email]>:
> Bjoern Michaelsen wrote
>> What do:
>>
>>> git log -1
>
> It returns the commit where I wanted to return.

and that would be what commit?

> [...]
> However About box when I launch libo returns
> Version: 4.3.0.0.alpha1+
> Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa

That commit's configure.ac shows 4.3.0.0.alpha1+ version - so that
then is expected.
The commit wasn't selected from 4-2 branch

Looking at that commit's date (4 days ago) also confirms this.
http://cgit.freedesktop.org/libreoffice/core/commit/?h=c6c286f14468d341f5fd88edc39a37175a1b6caa
is from end of april 2014, not from october 2013.

So remember that LO just passes control to running instance, so when
you have 4.3 alpha+ running, and then launch 4.2 dev, it will still
just reuse 4.3

ciao
Christian
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Laurent BP Laurent BP
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

In reply to this post by Christian Lohmaier-3
Hello,

Thanks for your comments. However I did not yet succeed.

Christian Lohmaier-3 wrote
Hmm. I wouldn't do that (as I don't know what that would do), instead I'd do a

git checkout -b myoldlibreofficebranch whatevergitcommityoupicked

That should do the trick.
I tried the following commands:
> git checkout -b myoldlibreofficebranch dace560b350346b9f9a102ee602bb129a008bcfe
> make distclean
> ./autogen.sh && make
> ./instdir/program/soffice
But About box says: Version: 4.3.0.0.alpha1+
Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa

However, "git log -1" returns
==================================
commit dace560b350346b9f9a102ee602bb129a008bcfe
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Fri Oct 11 20:45:22 2013 +0100

    CID#736194 out of bounds
   
    Change-Id: I236c2f51716bfebd0c132bbaed50c1f1ec811ffa
==================================

"git branch" returns
==================================
  UITrendLineNbPoints
  commandNameEnterGroup
  importDrawAOO4
  libreoffice-4-2
  master
* myoldlibreofficebranch
==================================

and "git status" returns (my own translation)
# On branch myoldlibreofficebranch
# Files not followed:
#   (use "git add <file>..." to include in what will be validated)
#
#       external/tarballs/
#       ios/lo.xcconfig

I do not understand what is happening :(
"git" seems to be OK but "make" seems to build another branch (actually my branch "master")

Christian Lohmaier-3 wrote
btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-)
No, I did not update my signature for a long time.

Many thanks in advance for your help.

Laurent BP
LibreOffice 5.3.5
Ruslan Kabatsayev Ruslan Kabatsayev
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

Hi,

So you want to reset your local branch to libreoffice-4-2, right? I
think what you need is switching to your local branch and doing

git reset --hard origin/libreoffice-4-2

This should ensure that you reset to the "real" libreoffice-4-2 branch
from remote, not to anything you might have messed up in your local
libreoffice-4-2 branch.

Regards,
Ruslan

On Thu, May 1, 2014 at 12:11 PM, Laurent BP <[hidden email]> wrote:

> Hello,
>
> Thanks for your comments. However I did not yet succeed.
>
>
> Christian Lohmaier-3 wrote
>> Hmm. I wouldn't do that (as I don't know what that would do), instead I'd
>> do a
>>
>> git checkout -b myoldlibreofficebranch whatevergitcommityoupicked
>>
>> That should do the trick.
>
> I tried the following commands:
>> git checkout -b myoldlibreofficebranch
>> dace560b350346b9f9a102ee602bb129a008bcfe
>> make distclean
>> ./autogen.sh && make
>> ./instdir/program/soffice
> But About box says: Version: 4.3.0.0.alpha1+
> Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa
>
> However, "git log -1" returns
> ==================================
> commit dace560b350346b9f9a102ee602bb129a008bcfe
> Author: Caolán McNamara <[hidden email]>
> Date:   Fri Oct 11 20:45:22 2013 +0100
>
>     CID#736194 out of bounds
>
>     Change-Id: I236c2f51716bfebd0c132bbaed50c1f1ec811ffa
> ==================================
>
> "git branch" returns
> ==================================
>   UITrendLineNbPoints
>   commandNameEnterGroup
>   importDrawAOO4
>   libreoffice-4-2
>   master
> * myoldlibreofficebranch
> ==================================
>
> and "git status" returns (my own translation)
> # On branch myoldlibreofficebranch
> # Files not followed:
> #   (use "git add <file>..." to include in what will be validated)
> #
> #       external/tarballs/
> #       ios/lo.xcconfig
>
> I do not understand what is happening :(
> "git" seems to be OK but "make" seems to build another branch (actually my
> branch "master")
>
>
> Christian Lohmaier-3 wrote
>> btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-)
>
> No, I did not update my signature for a long time.
>
> Many thanks in advance for your help.
>
> Laurent BP
>
>
>
> -----
> LibreOffice 4.2.4.1
> --
> View this message in context: http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107083.html
> Sent from the Dev mailing list archive at Nabble.com.
> _______________________________________________
> LibreOffice mailing list
> [hidden email]
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Laurent BP Laurent BP
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

Thanks Ruslan for your answer.
Ruslan Kabatsayev wrote
So you want to reset your local branch to libreoffice-4-2, right? I
think what you need is switching to your local branch and doing

git reset --hard origin/libreoffice-4-2
OK. It works. Now after make distclean and autogen and make
I've got a 4.2 version up to date: Version: 4.2.5.0.0+
Build ID: d1d25c8cbc2962ce2501b4ed6034d2e4e4ccba9a

And now, how can I revert to dace560b350346b9f9a102ee602bb129a008bcfe?

Regards,

Laurent BP
LibreOffice 5.3.5
Ruslan Kabatsayev Ruslan Kabatsayev
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

On Thu, May 1, 2014 at 7:23 PM, Laurent BP <[hidden email]> wrote:

> Thanks Ruslan for your answer.
>
> Ruslan Kabatsayev wrote
>> So you want to reset your local branch to libreoffice-4-2, right? I
>> think what you need is switching to your local branch and doing
>>
>> git reset --hard origin/libreoffice-4-2
>
> OK. It works. Now after make distclean and autogen and make
> I've got a 4.2 version up to date: Version: 4.2.5.0.0+
> Build ID: d1d25c8cbc2962ce2501b4ed6034d2e4e4ccba9a
>
> And now, how can I revert to dace560b350346b9f9a102ee602bb129a008bcfe?

If you reset to this commit, you'll appear somewhere in the master
branch. Are you sure this is what you want? This would then explain
why your version after build was 4.3. It seems you've picked the wrong
sha1 of the commit.
Also, note that when a commit is pushed to several branches, each its
instance will have its own unique hash. Thus, you should check, which
of all these sha1 sums you really want to switch to. (Although this
one doesn't have copies of its commit message as I've searched.)

>
> Regards,
>
> Laurent BP
>
>
>
>
> -----
> LibreOffice 4.2.4.1
> --
> View this message in context: http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107154.html
> Sent from the Dev mailing list archive at Nabble.com.
> _______________________________________________
> LibreOffice mailing list
> [hidden email]
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Michael Stahl-2 Michael Stahl-2
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

In reply to this post by Laurent BP
On 01/05/14 10:11, Laurent BP wrote:

>
> I tried the following commands:
>> git checkout -b myoldlibreofficebranch
>> dace560b350346b9f9a102ee602bb129a008bcfe
>> make distclean
>> ./autogen.sh && make
>> ./instdir/program/soffice
> But About box says: Version: 4.3.0.0.alpha1+
> Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa
>
> However, "git log -1" returns
> ==================================
> commit dace560b350346b9f9a102ee602bb129a008bcfe
> Author: Caolán McNamara <[hidden email]>
> Date:   Fri Oct 11 20:45:22 2013 +0100
>
>     CID#736194 out of bounds

there's a subtle problem here - that commit pre-dates the removal of
INPATH, so if you run ./instdir/program/soffice you get the result of a
previous build (which would not be cleaned by "make clean" on this
revision!); you need to run ./instdir/unxlng*/program/soffice (or
perhaps even "make dev-install" and run it from solver/*/installation)

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Laurent BP Laurent BP
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

Michael Stahl-2 wrote
there's a subtle problem here - that commit pre-dates the removal of
INPATH, so if you run ./instdir/program/soffice you get the result of a
previous build (which would not be cleaned by "make clean" on this
revision!); you need to run ./instdir/unxlng*/program/soffice (or
perhaps even "make dev-install" and run it from solver/*/installation)
That sounds more logical with my problem. I failed to build but I will try again and search for the right soffice exe file.
Thanks * for your help.

Laurent BP
LibreOffice 5.3.5
Laurent BP Laurent BP
Reply | Threaded
Open this post in threaded view
|

Re: How to build an old version of LibO

Actually, the exe file was ./instdir/unxlngx6.pro/program/soffice

That's all folks :)

Thanks again.

Laurent BP
LibreOffice 5.3.5