> On Oct 11, 2020, at 5:48 PM, Matthias Seidel <matthias.sei...@hamburg.de> > wrote: > > Hi Peter, > > Am 11.10.20 um 23:31 schrieb Peter Kovacs: >> The code checks if it is a git repo and falls back to the assumption it is a >> svn repo. I am not sure if there is a default. >> It is a script called svnrevision I think. > Andrea is talking about the source tarball here. > > Formerly if you built from it there was no revision at all in the About > dialog. > Jim changed the creation of the tarball to include a file "reporevision.lst" > that contains the Git hash now. > > I don't know why Andreas build did not pick up the file... >
Yeah, that is weird... we do specifically tuck that value away. > Regards, > > Matthias > >> >> Am 11. Oktober 2020 23:25:44 MESZ schrieb Don Lewis <truck...@apache.org> >> <mailto:truck...@apache.org>: >>> On 11 Oct, Andrea Pescetti wrote: >>>> I've built the 4.1.8-RC2 sources from >>>> https://dist.apache.org/repos/dist/dev/openoffice/4.1.8-RC2/source/ >>>> <https://dist.apache.org/repos/dist/dev/openoffice/4.1.8-RC2/source/> >>>> on a new CentOS 7 VM and generated "installed" (not packaged), RPM >>> and >>>> DEB builds that I tested on a variety of Fedora and Ubuntu systems. >>>> >>>> All good, for the most part. I'm still catching up with e-mails so I >>>> didn't test anything specific to 4.1.8, just general usage. I have >>> news >>>> on the "General error" on Ubuntu too, but I'll expand on this in the >>>> relevant thread. >>>> >>>> But I'd like to highlight two issues occurring in the last stage of >>> the >>>> build, i.e., when we produce the RPM/DEB packages. >>>> >>>> 1) Jim's EPM installed as per >>>> >>> https://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO/Step_by_step#CentOS_7_for_AOO_4.2.x_and_later >>> >>> <https://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO/Step_by_step#CentOS_7_for_AOO_4.2.x_and_later> >>>> didn't work for me. I got >>>> >>>> Error: ERROR: More than one new package in directory >>>> >>>> Configuring with >>>> >>>> ... >>>> >>> --with-epm-url=http://sourceforge.net/projects/oooextras.mirror/files/epm-3.7.tar.gz >>> <http://sourceforge.net/projects/oooextras.mirror/files/epm-3.7.tar.gz> >>>> did work instead, so I'd like to know if people who used the wiki >>>> instructions >>>> >>>> $ wget https://github.com/jimjag/epm/archive/epm-4.4.2.tar.gz >>>> <https://github.com/jimjag/epm/archive/epm-4.4.2.tar.gz> >>>> $ # (extract the archive) >>>> $ cd epm-epm-4.4.2 >>>> $ ./configure --prefix=/usr/local --enable-aoo; make install >>>> >>>> had better luck. Or maybe the new EPM is to be used for 4.2.x builds >>> only? >>>> 2) Something seems wrong here: >>>> >>>> >>> https://github.com/apache/openoffice/blob/AOO418/main/solenv/bin/modules/RepoRevision.pm#L78 >>> >>> <https://github.com/apache/openoffice/blob/AOO418/main/solenv/bin/modules/RepoRevision.pm#L78> >>>> We populate the "Rev." section of the About dialog based on version >>>> control, so for a tarball (no Git, no SVN) this should result in >>>> "unknown-rev"; but it doesn't and Git is called instead, returning an >>>> error message. >>>> >>>> To my purpose I simply used a hardcoded string and completed the >>> build, >>>> but it should be checked better: the official tarball is not a git >>> clone >>>> and this will always result in a (non-blocking) error message if >>> someone >>>> builds from it. >>> I thought that the source tarball was supposed to include an artifact >>> containing the git revision info. >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org >>> <mailto:dev-unsubscr...@openoffice.apache.org> >>> For additional commands, e-mail: dev-h...@openoffice.apache.org >>> <mailto:dev-h...@openoffice.apache.org>
