Menu
▾
▴
[Gtk2hs-commit] (main branch): Makefile.am, configure.ac: make haddock2 work
|
From: Peter g. <pg...@co...> - 2008-10-08 17:22:17
|
Mon Sep 22 20:32:30 EDT 2008 Peter Gavin <pg...@gm...>
* Makefile.am, configure.ac: make haddock2 work
Haddock 2.3 or better is required (which, at the time being, has yet to be released)
hunk ./Makefile.am 1768
-gnomevfs_System_Gnome_VFS_FileInfo_hs_HCFLAGS = '-\#include "hsfileinfo.h"'
+gnomevfs_System_Gnome_VFS_FileInfo_hs_HCFLAGS = '-\#include"hsfileinfo.h"'
hunk ./Makefile.am 1979
+ gstreamer/Media/Streaming/GStreamer/Core/GObjectHierarchyBase.hs \
hunk ./Makefile.am 2208
-htmldoc_HSFILES = $(filter-out $(htmldoc_HSFILES_EXCLUDE), \
- $(foreach PACKAGE,$(PACKAGES),$(libHS$(PACKAGE)_a_HSFILES)))
-
-htmldoc_DATA = \
+htmldoc_haddock_files = \
hunk ./Makefile.am 2221
+
hunk ./Makefile.am 2223
-htmldoc_DATA +=
+if !HADDOCK2
+htmldoc_haddock_files +=
hunk ./Makefile.am 2228
+endif
+
+htmldoc_images = \
+ docs/reference/images/stock-icons/stock_about_24.png \
+ docs/reference/images/stock-icons/stock_add_24.png \
+ docs/reference/images/stock-icons/stock_align_center_24.png \
+ docs/reference/images/stock-icons/stock_align_justify_24.png \
+ docs/reference/images/stock-icons/stock_align_left_24.png \
+ docs/reference/images/stock-icons/stock_align_right_24.png \
+ docs/reference/images/stock-icons/stock_apply_20.png \
+ docs/reference/images/stock-icons/stock_bottom_24.png \
+ docs/reference/images/stock-icons/stock_broken_image_24.png \
+ docs/reference/images/stock-icons/stock_cancel_20.png \
+ docs/reference/images/stock-icons/stock_cdrom_24.png \
+ docs/reference/images/stock-icons/stock_clear_24.png \
+ docs/reference/images/stock-icons/stock_close_24.png \
+ docs/reference/images/stock-icons/stock_color_picker_25.png \
+ docs/reference/images/stock-icons/stock_colorselector_24.png \
+ docs/reference/images/stock-icons/stock_connect_24.png \
+ docs/reference/images/stock-icons/stock_convert_24.png \
+ docs/reference/images/stock-icons/stock_copy_24.png \
+ docs/reference/images/stock-icons/stock_cut_24.png \
+ docs/reference/images/stock-icons/stock_dialog_authentication_48.png \
+ docs/reference/images/stock-icons/stock_dialog_error_48.png \
+ docs/reference/images/stock-icons/stock_dialog_info_48.png \
+ docs/reference/images/stock-icons/stock_dialog_question_48.png \
+ docs/reference/images/stock-icons/stock_dialog_warning_48.png \
+ docs/reference/images/stock-icons/stock_directory_24.png \
+ docs/reference/images/stock-icons/stock_disconnect_24.png \
+ docs/reference/images/stock-icons/stock_dnd_32.png \
+ docs/reference/images/stock-icons/stock_dnd_multiple_32.png \
+ docs/reference/images/stock-icons/stock_down_arrow_24.png \
+ docs/reference/images/stock-icons/stock_edit_24.png \
+ docs/reference/images/stock-icons/stock_exec_24.png \
+ docs/reference/images/stock-icons/stock_exit_24.png \
+ docs/reference/images/stock-icons/stock_file_24.png \
+ docs/reference/images/stock-icons/stock_first_24.png \
+ docs/reference/images/stock-icons/stock_font_24.png \
+ docs/reference/images/stock-icons/stock_fullscreen_24.png \
+ docs/reference/images/stock-icons/stock_harddisk_24.png \
+ docs/reference/images/stock-icons/stock_help_24.png \
+ docs/reference/images/stock-icons/stock_home_24.png \
+ docs/reference/images/stock-icons/stock_index_24.png \
+ docs/reference/images/stock-icons/stock_info_24.png \
+ docs/reference/images/stock-icons/stock_jump_to_24.png \
+ docs/reference/images/stock-icons/stock_last_24.png \
+ docs/reference/images/stock-icons/stock_leave_fullscreen_24.png \
+ docs/reference/images/stock-icons/stock_left_arrow_24.png \
+ docs/reference/images/stock-icons/stock_media_forward_24.png \
+ docs/reference/images/stock-icons/stock_media_next_24.png \
+ docs/reference/images/stock-icons/stock_media_pause_24.png \
+ docs/reference/images/stock-icons/stock_media_play_24.png \
+ docs/reference/images/stock-icons/stock_media_previous_24.png \
+ docs/reference/images/stock-icons/stock_media_record_24.png \
+ docs/reference/images/stock-icons/stock_media_rewind_24.png \
+ docs/reference/images/stock-icons/stock_media_stop_24.png \
+ docs/reference/images/stock-icons/stock_network_24.png \
+ docs/reference/images/stock-icons/stock_new_24.png \
+ docs/reference/images/stock-icons/stock_no_20.png \
+ docs/reference/images/stock-icons/stock_ok_20.png \
+ docs/reference/images/stock-icons/stock_open_24.png \
+ docs/reference/images/stock-icons/stock_paste_24.png \
+ docs/reference/images/stock-icons/stock_preferences_24.png \
+ docs/reference/images/stock-icons/stock_print_24.png \
+ docs/reference/images/stock-icons/stock_print_preview_24.png \
+ docs/reference/images/stock-icons/stock_properties_24.png \
+ docs/reference/images/stock-icons/stock_redo_24.png \
+ docs/reference/images/stock-icons/stock_refresh_24.png \
+ docs/reference/images/stock-icons/stock_remove_24.png \
+ docs/reference/images/stock-icons/stock_revert_24.png \
+ docs/reference/images/stock-icons/stock_right_arrow_24.png \
+ docs/reference/images/stock-icons/stock_save_24.png \
+ docs/reference/images/stock-icons/stock_save_as_24.png \
+ docs/reference/images/stock-icons/stock_search_24.png \
+ docs/reference/images/stock-icons/stock_search_replace_24.png \
+ docs/reference/images/stock-icons/stock_sort_ascending_24.png \
+ docs/reference/images/stock-icons/stock_sort_descending_24.png \
+ docs/reference/images/stock-icons/stock_spellcheck_24.png \
+ docs/reference/images/stock-icons/stock_stop_24.png \
+ docs/reference/images/stock-icons/stock_text_bold_24.png \
+ docs/reference/images/stock-icons/stock_text_indent_24.png \
+ docs/reference/images/stock-icons/stock_text_italic_24.png \
+ docs/reference/images/stock-icons/stock_text_strikethrough_24.png \
+ docs/reference/images/stock-icons/stock_text_underline_24.png \
+ docs/reference/images/stock-icons/stock_text_unindent_24.png \
+ docs/reference/images/stock-icons/stock_top_24.png \
+ docs/reference/images/stock-icons/stock_trash_24.png \
+ docs/reference/images/stock-icons/stock_undelete_24.png \
+ docs/reference/images/stock-icons/stock_undo_24.png \
+ docs/reference/images/stock-icons/stock_up_arrow_24.png \
+ docs/reference/images/stock-icons/stock_yes_20.png \
+ docs/reference/images/stock-icons/stock_zoom_1_24.png \
+ docs/reference/images/stock-icons/stock_zoom_fit_24.png \
+ docs/reference/images/stock-icons/stock_zoom_in_24.png \
+ docs/reference/images/stock-icons/stock_zoom_out_24.png
hunk ./Makefile.am 2324
-$(htmldoc_DATA) : $(htmldoc_HSFILES)
+htmldoc_DATA = $(htmldoc_haddock_files) $(htmldoc_images)
+
+if !HADDOCK2
+
+htmldoc_HSFILES = $(filter-out $(htmldoc_HSFILES_EXCLUDE), \
+ $(foreach PACKAGE,$(PACKAGES),$(libHS$(PACKAGE)_a_HSFILES)))
+
+$(htmldoc_haddock_files) : $(htmldoc_HSFILES)
hunk ./Makefile.am 2339
+else
hunk ./Makefile.am 2341
-doc_CLEANFILES = $(htmldoc_DATA)
+htmldoc_HSFILES = $(foreach DEPPKG,$(PACKAGES),$(libHS$(DEPPKG)_a_HSFILES))
+
+htmldoc_HSFILES_AM = $(foreach HSFILE, $(htmldoc_HSFILES), $(subst .,_,$(subst /,_,$(HSFILE))))
+
+all_externaldeps = $(sort $(foreach DEPPKG,$(PACKAGES),$(libHS$(DEPPKG)_a_EXTERNALDEPS)))
+
+htmldoc_haddock_interfaces = \
+ $(foreach DEPPKG,$(all_externaldeps),$(shell $(GHCPKG) field $(DEPPKG) haddock-interfaces | sed 's,^[^:]*:,,' ))
+
+$(htmldoc_haddock_files) : $(htmldoc_HSFILES)
+ mkdir -p docs/reference
+ echo $(all_externaldeps)
+ echo $(htmldoc_haddock_interfaces)
+ $(strip $(HADDOCK) --html --odir=docs/reference \
+ --title="Gtk2Hs" \
+ --dump-interface=docs/reference/gtk2hs.haddock \
+ --prologue=docs/prologue.txt \
+ $(addprefix --read-interface=, $(htmldoc_haddock_interfaces)) \
+ $(addprefix --optghc=,$(sort $(foreach PACKAGE, $(PACKAGES), $(libHS$(PACKAGE)_a_HCFLAGS) $(libHS$(PACKAGE)_a_CPPFLAGS))) \
+ $(sort $(foreach HSFILE, $(htmldoc_HSFILES_AM), $($(HSFILE)_HCFLAGS)))) \
+ $(HADDOCK_FLAGS) $^)
+
+endif
+
+doc_CLEANFILES = $(htmldoc_haddock_files)
hunk ./configure.ac 833
+ GTKHS_PROG_CHECK_VERSION($HADDOCK_VERSION, -ge, 2.0, [HADDOCK2="yes";])
hunk ./configure.ac 837
+AM_CONDITIONAL(HADDOCK2, test "$HADDOCK2" = "yes")
hunk ./glib/System/Glib/Types.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gnomevfs/System/Gnome/VFS/Constants.hsc 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gnomevfs/System/Gnome/VFS/Marshal.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 304
-type DirectoryVisitCallback = String -- ^ the path of the visited file, relative to the base directory
- -> FileInfo -- ^ the 'FileInfo' for the visited file
- -> Bool -- ^ 'True' if returning 'DirectoryVisitRecurse' will cause a loop
- -> IO DirectoryVisitResult -- ^ the next action to be taken
+-- [_$_]
+-- The parameters, from left to right, are:
+-- * the path of the visited file, relative to the base directory,
+-- * the 'FileInfo' for the visited file,
+-- * 'True' if returning 'DirectoryVisitRecurse' will cause a loop, otherwise 'False'.
+-- [_$_]
+-- The callback must return the next action to be taken.
+type DirectoryVisitCallback = String
+ -> FileInfo
+ -> Bool
+ -> IO DirectoryVisitResult
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 343
-type MonitorCallback = MonitorHandle -- ^ the handle to a filesystem monitor
- -> TextURI -- ^ the URI being monitored
- -> TextURI -- ^ the actual file that was modified
- -> MonitorEventType -- ^ the event that occured
+-- [_$_]
+-- The parameters, from left to right, are:
+-- * the handle to a filesystem monitor,
+-- * the URI being monitored,
+-- * the actual file that was modified,
+-- * the event that occured.
+type MonitorCallback = MonitorHandle
+ -> TextURI
+ -> TextURI
+ -> MonitorEventType
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 398
-type XferProgressCallback = XferProgressInfo -- ^ @info@ - information about the progress of the current transfer
- -> IO Bool -- ^ return 'Prelude.False' to abort the transfer, 'Prelude.True' otherwise.
+--
+-- The callback must return 'Prelude.False' to abort the transfer, or 'Prelude.True' otherwise.
+type XferProgressCallback = XferProgressInfo
+ -> IO Bool
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 406
-type XferErrorCallback = XferProgressInfo -- ^ @info@ - information about the progress of the current transfer
- -> IO XferErrorAction -- ^ the action to be performed in response to the error
+--
+-- The callback must return the action to be performed in response to the error.
+type XferErrorCallback = XferProgressInfo
+ -> IO XferErrorAction
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 414
-type XferOverwriteCallback = XferProgressInfo -- ^ @info@ - information about the progress of the current transfer
- -> IO XferOverwriteAction -- ^ the action to be performed when the target file already exists
+--
+-- The callback must return the action to be performed when the target file already exists.
+type XferOverwriteCallback = XferProgressInfo
+ -> IO XferOverwriteAction
hunk ./gnomevfs/System/Gnome/VFS/Types.chs.pp 422
-type XferDuplicateCallback = XferProgressInfo -- ^ @info@ - information about the progress of the current transfer
- -> String -- ^ @duplicateName@ - the name of the target file
- -> Int -- ^ @duplicateCount@ - the number of duplicates that exist
- -> IO (Maybe String) -- ^ the new filename that should be used, or 'Prelude.Nothing' to abort.
+--
+-- The parameters, from left to right, are:
+-- * @info@ - information about the progress of the current transfer,
+-- * @duplicateName@ - the name of the target file,
+-- * @duplicateCount@ - the number of duplicates that exist.
+--
+-- The callback must return the new filename that should be used, or 'Prelude.Nothing' to abort.
+type XferDuplicateCallback = XferProgressInfo
+ -> String
+ -> Int
+ -> IO (Maybe String)
hunk ./gstreamer/Media/Streaming/GStreamer/Audio/Types.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Types.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Controller/Types.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Core/HierarchyBase.hs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Core/MiniHierarchyBase.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Types.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Hierarchy.chs.template 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/MiniHierarchy.chs.template 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gstreamer/Media/Streaming/GStreamer/Net/Types.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Abstract/ContainerChildProperties.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Gdk/PixbufData.hs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/General/DNDTypes.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/ModelView/Types.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Multiline/Types.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Pango/Attributes.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Pango/Description.chs 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Pango/GlyphStorage.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/Pango/Types.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreePath.chs.pp 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./tools/callbackGen/Signal.chs.template 1
+{-# OPTIONS_HADDOCK hide #-}
hunk ./tools/hierarchyGen/Hierarchy.chs.template 1
+{-# OPTIONS_HADDOCK hide #-}
|
