[Pkg-giraffe-discuss] update/how to proceed?

[Guido Günther]

On Mon, Jun 01, 2015 at 05:16:16PM +0200, Mark Dufour wrote:
> 
> > I think we're mostly done. I vaguely remember that I wanted to be able
> > to rerun autoreconf to update to a newer libtool. This is more
> > complicated than it should be since there are missing lots of "if !
> > OSS_ONLY" in the Makefile.ams, seems it got never tested in the OSS so I
> > drifted to other projects.
> 
> you mean there are too many 'if ! OSS_ONLY' parts? :-) I just added this to our dist-hook:

E.g.

configure.ac:737: error: required file 'liblicense/Makefile.in' not found
configure.ac:737: error: required file 'licensed/Makefile.in' not found
configure.ac:737: error: required file 'libtimezone/Makefile.in' not found
configure.ac:737: error: required file 'libcalendar/Makefile.in' not found
configure.ac:737: error: required file 'libcalendar/src/Makefile.in' not found
configure.ac:737: error: required file 'libcalendar/include/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-backup/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-backup/helpers/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-report/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-msr/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-ocf/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/za-extra/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-ws/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-ws/etc/Makefile.in' not found
configure.ac:737: error: required file 'ECtools/zarafa-presence/Makefile.in' not found

since the there are lots of files referened that are missing in
the OSS tarball.

> 
> find ${distdir} -name Makefile.am -exec sed -i -e '/^if ! OSS_ONLY/,/^endif/d' {} \;
> sed -i -e '/^if test -d `dirname $0`\/licensed; then/,/^fi/d' ${distdir}/configure.ac
> 
> so all the proprietary parts are now completely removed and
> 'autoreconf --force --install' at least is happy (well, apart from a
> warning about subdir-objects..).

Yeah. That helps for parts but not the above but maybe that's already
fixed in 7.2.x ?

> I haven't looked at your git tree yet, but perhaps you could run this manually (if you agree with the approach) once to see if it also works for you..?

See above. The approach is fine!
Cheers
 -- Guido