Hi Andreas, On Mon, 2006-11-06 at 22:11 +0100, Andreas Tobler wrote: > this patchlet installs the necessary html files in the example directory. > > Ok?
Looks good to me. I think we also need the html files in the example.zip file itself like the icons to make it self-contained. I extended your patch to do this. If you like the attached please check it in. Thanks, Mark
Index: examples/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v retrieving revision 1.14 diff -u -r1.14 Makefile.am --- examples/Makefile.am 22 Sep 2006 22:53:16 -0000 1.14 +++ examples/Makefile.am 6 Nov 2006 21:59:42 -0000 @@ -36,11 +36,14 @@ # the png icons we use in some of the examples. EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png +# the html pages we use in the swing demo example. +EXAMPLE_HTML = $(srcdir)/gnu/classpath/examples/swing/*.html + # The example specific README files. READMES = $(srcdir)/gnu/classpath/examples/CORBA/swing/README.html # All the files we find "interesting" -ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_CH_FILES) $(EXAMPLE_ICONS) $(READMES) +ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_CH_FILES) $(EXAMPLE_ICONS) $(EXAMPLE_HTML) $(READMES) # Some architecture independent data to be installed. example_DATA = $(EXAMPLE_ZIP) README @@ -96,10 +99,13 @@ # To generate the example zip just depend on the sources and ignore the # class files. Always regenerate all .class files and remove them immediatly. -# And copy the png icons we use to the classes dir so they get also included. +# And copy the png icons and html files we use to the classes dir +# so they get also included. $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) mkdir -p classes/gnu/classpath/examples/icons cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons + mkdir -p classes/gnu/classpath/examples/swing + cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES) (cd classes; \ if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi; \
