mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-12-25 13:37:02 +03:00
35d3d6d0bb
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from svn://svn.netsurf-browser.org/branches/adamblokus/netsurf ........ r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines Pdf plotting skeleton pinned on Print Preview in GTK. Just creates a file and draws lines. ........ r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines Pdf plotter - added drawing some graphic primitives. Still with limited functionality, but a snapshot of the currently viewed page can be made and resembles the original. ........ r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines Corrected encoding name ........ r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines Colours and polygons added. ........ r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines Added rectangles, filled boxes and clipping. Taken into consideration joty's comments. Added a todo list for this part. Added some debug stuff and checking boundaries. ........ r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles ........ r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines Some more options in graphic primitives and normalizing some parameters. ........ r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines Plotting changed as jmb suggested (is the least invasive one from the possible) Added dummy bitmap plotting - way of plotting an image is determined by its type. ........ r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;) ........ r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines Added hadling images other than png and jpeg - with transparency. ........ r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines Added handling NULL-returns from all mallocs. Added plot_bitmap_tile handling. Changed code style a little. ........ r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines Added a first prototype of the paged-output organization. Still not sure about naming, file locations etc. Works with the same pdf plotting as before. ........ r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines Added primitive width adjustment and outputing the whole website in multiple pages. ........ r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line Fix RISC OS build failure (change r4235 wasn't complete). ........ r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines This enables "Export PDF" in RISC OS build: - Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT - Makefile.sources(S_PDF): Add to RISC OS target as well. - utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have PDF export functionality or not. - riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made by Adam Blokus to write a PDF file under RISC OS. - riscos/save.c: Call save_as_pdf added. - riscos/menus.c: Add 'Export->PDF' menu entry. - riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF. - desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF. - desktop/print.c(print_run): Added return value. - Makefile(CCACHE): Moved closed to the place where CC is set for the first time. (LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs. ........ r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines Added margins and page size adjustment. ........ r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines Added 'fuzzy' margins on page bottom. Disabled direct png embedding, because it is too unstable in Haru now. ........ r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path. ........ r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines Added skeleton of applying loose layout. Minor code cleaning-up. ........ r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines Implemented the elementar ideas of the loose layout. Added scaling in the printing routine. Added some basic demonstrations. ........ r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines Cleaned up the loosing code - commited to much of leftover rubbish code. ........ r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines Added duplicating box tree and current content - window flickering during printing solved. Minor error checking after new HPDF_Image_AddSMask call. ........ r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines Changes in loosen layout (image resizing). ........ r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines Added pdf font handling and rendering functions with the use of Haru functions. ........ r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines Added a very basic and still buggy GTK print implementation. ........ r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines Added gtk printing one more time - I have forgotten to add the main file. ........ r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines removed error with comment ........ r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines Major style improvements - added a lot of doxygen comments, followed tlsa's style guide. Added some more error checking, too. ........ r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines Cleaned up the code. ........ r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines Changed everything according to jmb's review plus some minor bug fixes to gtk_print. ........ r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines Solved the netsurf.glade clash from r4421. ........ r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines Fixed bug with wrong number of pages in gtk printing. ........ r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines - fixed uncommented line from the previous commit - fixed bug with scale bigger than 1.0 (incorretly clipped page) ........ r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines Fixed bug in gtk_print_font_paint (and nsfont_paint). ........ r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines Bug fix in nsfont_paint. ........ r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines Added gtk_selection files. ........ r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines Addam missing glade files. ........ r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions. ........ r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS. ........ r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines Applied changes according to joty's review. Added checking the dimensions of a plotted image to pdf plotter. Commented out jpg embedding (it seems to cause some problems I'll bring it back when I figure out what's wrong) . Added back some files removed by mistake. ........ svn path=/trunk/netsurf/; revision=4741
154 lines
5.3 KiB
Makefile
154 lines
5.3 KiB
Makefile
#
|
|
# Makefile for NetSurf
|
|
#
|
|
# Included by main makefile -- indicates sources
|
|
# for each build.
|
|
#
|
|
|
|
S_CONTENT := content.c fetch.c fetchcache.c urldb.c \
|
|
fetchers/fetch_curl.c fetchers/fetch_data.c
|
|
S_CSS := css.c css_enum.c parser.c ruleset.c scanner.c
|
|
S_RENDER := box.c box_construct.c box_normalise.c \
|
|
directory.c form.c html.c html_redraw.c \
|
|
imagemap.c layout.c list.c table.c textplain.c
|
|
S_UTILS := base64.c filename.c hashtable.c locale.c messages.c talloc.c \
|
|
url.c utf8.c utils.c useragent.c
|
|
S_DESKTOP := knockout.c options.c tree.c version.c
|
|
|
|
# S_COMMON are sources common to all builds
|
|
S_COMMON := $(addprefix content/,$(S_CONTENT)) \
|
|
$(addprefix css/,$(S_CSS)) \
|
|
$(addprefix render/,$(S_RENDER)) \
|
|
$(addprefix utils/,$(S_UTILS)) \
|
|
$(addprefix desktop/,$(S_DESKTOP))
|
|
|
|
S_IMAGE := bmp.c bmpread.c gif.c gifread.c ico.c jpeg.c \
|
|
mng.c nssprite.c svg.c rsvg.c
|
|
# S_IMAGE are sources related to image management
|
|
S_IMAGE := $(addprefix image/,$(S_IMAGE))
|
|
|
|
# S_BROWSER are sources related to full browsers but are common
|
|
# between RO and Unix builds
|
|
S_BROWSER := browser.c frames.c history_core.c netsurf.c save_text.c selection.c \
|
|
textinput.c
|
|
|
|
S_BROWSER := $(addprefix desktop/,$(S_BROWSER))
|
|
|
|
# S_RISCOS are sources purely for the RISC OS build
|
|
S_RISCOS := 401login.c artworks.c assert.c awrender.s bitmap.c buffer.c \
|
|
cookies.c configure.c debugwin.c dialog.c download.c draw.c filetype.c \
|
|
font.c global_history.c gui.c help.c history.c hotlist.c image.c \
|
|
menus.c message.c palettes.c plotters.c plugin.c print.c query.c \
|
|
save.c save_complete.c save_draw.c save_pdf.c schedule.c search.c sprite.c \
|
|
sslcert.c textarea.c textselection.c theme.c theme_install.c \
|
|
thumbnail.c \
|
|
treeview.c ucstables.c uri.c url_complete.c url_protocol.c wimp.c wimp_event.c \
|
|
window.c gui/progress_bar.c gui/status_bar.c \
|
|
$(addprefix configure/,con_cache.c con_connect.c con_content.c con_fonts.c \
|
|
con_home.c con_image.c con_inter.c con_language.c con_memory.c con_secure.c \
|
|
con_theme.c)
|
|
S_RISCOS := $(addprefix riscos/,$(S_RISCOS))
|
|
|
|
# S_DIALOGS are sources related to dialogs but required only
|
|
# for the GTK build
|
|
S_DIALOGS := gtk_options.c gtk_about.c
|
|
S_DIALOGS := $(addprefix gtk/dialogs/,$(S_DIALOGS))
|
|
|
|
# S_GTK are sources purely for the GTK build
|
|
S_GTK := font_pango.c gtk_bitmap.c gtk_gui.c gtk_schedule.c \
|
|
gtk_thumbnail.c gtk_plotters.c gtk_treeview.c gtk_scaffolding.c \
|
|
gtk_completion.c gtk_login.c gtk_throbber.c gtk_selection.c \
|
|
gtk_history.c gtk_window.c gtk_filetype.c gtk_download.c gtk_print.c
|
|
S_GTK := $(addprefix gtk/,$(S_GTK))
|
|
|
|
# S_PDF are sources of the pdf plotter + the ones for paged-printing
|
|
S_PDF := pdf_plotters.c font_haru.c
|
|
S_PRINT := print.c
|
|
S_LOOSE := loosen.c
|
|
S_PDF := $(addprefix pdf/,$(S_PDF)) $(addprefix desktop/,$(S_PRINT)) \
|
|
$(addprefix render/,$(S_LOOSE))
|
|
|
|
# S_BEOS are sources purely for the BeOS build
|
|
S_BEOS := beos_bitmap.cpp beos_fetch_rsrc.cpp beos_filetype.cpp beos_font.cpp \
|
|
beos_gui.cpp beos_history.cpp beos_login.cpp beos_options.cpp \
|
|
beos_plotters.cpp beos_scaffolding.cpp beos_schedule.cpp \
|
|
beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp \
|
|
beos_window.cpp
|
|
S_BEOS := $(addprefix beos/,$(S_BEOS))
|
|
RDEF_BEOS := beos_res.rdef
|
|
RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
|
|
|
|
# S_DEBUG are sources purely for the debug build
|
|
S_DEBUG := netsurfd.c debug_bitmap.c filetyped.c fontd.c
|
|
S_DEBUG := $(addprefix debug/,$(S_DEBUG))
|
|
|
|
# Some extra rules for building the scanner etc.
|
|
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
|
|
$(VQ)echo "MAKEENUM: css"
|
|
$(Q)$(PERL) css/makeenum css/css_enum < css/css_enums
|
|
ifeq ($(HOST),riscos)
|
|
css/parser.c css/parser.h: css/parser.y
|
|
$(VQ)echo " LEMON: css/parser.y"
|
|
$(Q)dir css
|
|
$(Q)-lemon parser.y
|
|
$(Q)dir ^
|
|
$(Q)touch css/parser.c css/parser.h
|
|
css/scanner.c: css/scanner.l
|
|
$(VQ)echo " RE2C: css/scanner.l"
|
|
$(Q)dir css
|
|
$(Q)re2c -s scanner.l > scanner.c
|
|
$(Q)dir ^
|
|
utils/translit.c: transtab
|
|
$(VQ)echo "TRANSTAB: utils/translit.c"
|
|
$(Q)dir utils
|
|
$(Q)$(PERL) tt2code < transtab > translit.c
|
|
$(Q)dir ^
|
|
else
|
|
css/parser.c css/parser.h: css/parser.y
|
|
$(VQ)echo " LEMON: css/parser.y"
|
|
$(Q)# If lemon really fails hard, we'll never know, sorry
|
|
$(Q)cd css; lemon parser.y || true
|
|
$(Q)# Unfortunately if the output hasn't changed, lemon doesn't
|
|
$(Q)# alter the file and thus make gets confused.
|
|
$(Q)touch css/parser.c css/parser.h
|
|
css/scanner.c: css/scanner.l
|
|
$(VQ)echo " RE2C: css/scanner.l"
|
|
$(Q)cd css; re2c -s scanner.l > scanner.c
|
|
utils/translit.c: transtab
|
|
$(VQ)echo "TRANSTAB: utils/translit.c"
|
|
$(Q)cd utils; $(PERL) tt2code < transtab > translit.c
|
|
endif
|
|
|
|
clean-intermediates:
|
|
$(VQ)echo " CLEAN: intermediates"
|
|
$(Q)$(RM) css/css_enum.c css/css_enum.h css/parser.c css/parser.out css/parser.h
|
|
$(Q)$(RM) css/scanner.c utils/translit.c
|
|
|
|
CLEANS += clean-intermediates
|
|
|
|
# Finally select the correct set of sources for this build...
|
|
|
|
ifeq ($(TARGET),riscos)
|
|
SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_RISCOS)
|
|
EXETARGET := !NetSurf/!RunImage$(EXEEXT)
|
|
endif
|
|
|
|
ifeq ($(TARGET),gtk)
|
|
SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_GTK) $(S_DIALOGS)
|
|
EXETARGET := nsgtk
|
|
endif
|
|
|
|
ifeq ($(TARGET),beos)
|
|
SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
|
|
EXETARGET := NetSurf
|
|
endif
|
|
|
|
ifeq ($(TARGET),debug)
|
|
SOURCES := $(S_COMMON) $(S_IMAGE) $(S_DEBUG)
|
|
EXETARGET := nsdebug
|
|
endif
|
|
|
|
ifeq ($(SOURCES),)
|
|
$(error Unable to build NetSurf, could not determine set of sources to build)
|
|
endif
|