[FFmpeg-devel] [PATCH] Add versioning information to dlls

[Diego Biurrun]

On Wed, May 28, 2008 at 03:07:38PM -0400, Jeremy Kolb wrote:
> 
> Diego Biurrun wrote:
> >> --- configure	(revision 13216)
> >> +++ configure	(working copy)
> >> +#include <WinVer.h>
> >> +#include "version.h"
> >> +VS_VERSION_INFO VERSIONINFO
> >> + FILEVERSION $version_commas
> >> + PRODUCTVERSION $version_commas
> >> + FILEFLAGSMASK 0x17L
> >> + FILEFLAGS 0x0L
> >> + FILEOS VOS__WINDOWS32
> >> + FILETYPE VFT_DLL
> >> + FILESUBTYPE 0x0L
> >
> > Is there a reason for this weird 1-space indentation?
> 
> Seems to be convention but I can remove it.

Whatever you prefer.

> >> +    if ! cmp -s $TMPRC $name/dllinfo.rc; then
> >> +        mv -f $TMPRC $name/dllinfo.rc
> >> +    fi
> >> +    rm -f $TMPRC
> >>     
> >
> > Is this necessary?  We regenerate config.mak and the pkg-config files
> > unconditionally.  config.h is treated this way because unnecessarily
> > recreating it triggers a lot of pointless recompiles.
> >   
> I guess not, I can just output to those files directly.  I did that 
> because an earlier patch did it.

Then output directly.

> >> --- subdir.mak	(revision 13216)
> >> +++ subdir.mak	(working copy)
> >> @@ -27,7 +27,9 @@
> >>  
> >> +$(SUBDIR)$(SLIB_EXTRA_OBJS): $(SLIB_EXTRA_DEP)
> >
> > I think you could just generate a proper .d file from the .rco file and
> > be done with it.  This would simplify things considerably.
> 
> How do you mean?  What are .d files?  How do I do that?

The .d files record dependency information.  Look around in your FFmpeg
tree, it should be full of them.  Take a look at common.mak to see how
they are created.

> >> -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
> >> +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)$(SLIB_EXTRA_OBJS)
> >
> > Alternatively, add that extra object to OBJS.  This should make things
> > simpler.  It also likely fixes the build failures we were seeing on some
> > platforms.
> 
> Ok, which one should I do?  The .d file or add the extra object?

Both.  The issues are separate.

Diego

P.S.: I know that you are a Windows guy, but please do learn to quote
properly anyway.  Trim your quotes and remove all unnecessary garbage,
plus things you are not replying to.