patchGnash - The GNU Flash player - Patches: patch #4865, patch for the build

 
 

You are not allowed to post comments on this tracker with your current authentication level.

patch #4865: patch for the build

Submitter:  Patrice Dumas <pertusus>
Submitted:  Sat 04 Feb 2006 01:13:14 AM UTC
   
 
Category:  None Priority:  5 - Normal
Status:  Done Privacy:  Public
Assigned to:  rsavoye Open/Closed:  Closed

Mon 06 Feb 2006 06:14:26 PM UTC, comment #5: 

Since there is an enhanced patch on this, I'm going to close this one, as this patch is now applied. with a few tweaks).

Rob Savoye <rsavoye>
Group administrator
Sun 05 Feb 2006 04:29:32 PM UTC, comment #4: 

After the quick cvs fix, the patch to the top level Makefile.am has a bit changed, I attach it.

Patrice Dumas <pertusus>
Sat 04 Feb 2006 10:54:26 PM UTC, comment #3: 

Here is a patch that fixes completly make distcheck for me, and allows to distribute all the documentation files that can be built. More precisely:

  • configure.ac: remove a macro appearing in text
  • Makefile.am: don't add $(STD_DIRS) to DOC_DIRS and PLUG_DIRS as it is allready in SUBDIRS

don't add macros to EXTRA_DIST, automake does the rules itself
add doc to SUBDIRS, otherwise the doc files (man pages, omf files) aren't installed

  • macros/docbook.m4: add AM_CONDITIONNALs for all the formats/tools (FOP, html, info, man).

Now that there are conditionnals for each of the formats, set --enable-docbook to be the default

  • doc/C/Makefile.am: conditionnally distribute the doc files, depending on the tools detected.

simplify the building rules, now that they are only used if the tools are found.
Shuffle around a few xml files such that they are used as prerequisites and distributed.
when calling DB2X_TEXIXML redirect stdout to gnash.texi, otherwise it creates only gnash_manual_v0.2.texi.
Split man and texi creation in two, first a call to DB2X_XSLTPROC and then to the other tool, and keep the intermediate files.
Don't install the images as the html file isn't installed anymore.

  • macros/firefox.m4: use --with-plugin-dir for the plugin directory location, and otherwise install it in ${libdir}/mozilla/plugins/. With the previous solution there was no ${prefix} in front of the plugin dir which could cause trouble when relying on the prefix to install the plugin somewhere (and make distcheck failed). Whenever ${libdir}/mozilla/plugins/ isn't right, the --with-plugin-dir can be used, as the mozilla library directory may be different from the plugin directory.
  • plugin/Makefile.am: fix plugin installation
  • server/Makefile.am: fixes for make distcheck



As a side note, it seems right to me not to install the html and pdf files as it is customary to let the packagers the choice to package them or not. The info files could be installed, though (and I'll look at that).

Patrice Dumas <pertusus>
Sat 04 Feb 2006 09:29:34 PM UTC, comment #2: 

It's strange that make distcheck works for you with the cvs version, it doesn't work for me (because macros is in EXTRA_DIST and not created in distdir, and also because the plugin isn't installed in a location prefixed by ${prefix}, and also because internals.xml isn't distributed). I have another patch almost ready that fix make distcheck for me.

Maybe the discrepancy is explained by the difference in automake/autoconf versions. Mine are 1.9.6/2.59.

Patrice Dumas <pertusus>
Sat 04 Feb 2006 08:04:50 PM UTC, comment #1: 

I just checked in a variation of your patch that fixes things so the "make distcheck" target works, and everything goes in the "make dist" tarball that should be. (like the macros)

I kept getting errors with the original patch, it claims dist_docu_DATA is undefined, so the automake fails. There is further work that needs to be done to solidify the distribution building. For one thing, there is no support for installing the files into GNOME help from a distribution. But this patch is at the least a step in the right direction.

The new version of FOP is being fixed to work with GCJ, but I haven't yet gotten it to work completely yet. It appears it's incompatable with the older version of fop.

Rob Savoye <rsavoye>
Group administrator
Sat 04 Feb 2006 01:13:14 AM UTC, original submission:  

A big patch for the build system, on the road to a working make distcheck, but still not there.

I made many changes in the doc stuff, my idea is that everything that is released should be build by make. So I removed gnash.pdf from the distributed files, because it seems to me that fop cannot be easily installed without non free stuff from sun. I also tried to simplify things.


Patrice Dumas <pertusus>

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attached Files
file #9535:  Makefile.am-allready_a_plus.diff added by pertusus (796B - text/x-patch - patch for Makefile.am redone against cvs)
file #9526:  build_cond.diff added by pertusus (13KiB - text/x-patch - patch for the build with conditionnal doc distribution)
file #9523:  build.diff added by pertusus (6KiB - text/x-patch - patch for the build system)

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

 

Follow 7 latest changes.

Date Changed by Updated Field Previous Value => Replaced by
2006-02-06 rsavoye StatusWorks For Me Done
    Open/ClosedOpen Closed
2006-02-05 pertusus Attached File- Added Makefile.am-allready_a_plus.diff, #5888
2006-02-04 pertusus Attached File- Added build_cond.diff, #5877
2006-02-04 rsavoye StatusNone Works For Me
    Assigned toNone rsavoye
2006-02-04 pertusus Attached File- Added build.diff, #5873

Back to the top

Powered by Savane 3.13-4b48.
Corresponding source code