netsurf: branch master updated. release/3.3-43-gd3c4eb7

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/d3c4eb73631b0f3fb5b08... ...commit http://git.netsurf-browser.org/netsurf.git/commit/d3c4eb73631b0f3fb5b0840... ...tree http://git.netsurf-browser.org/netsurf.git/tree/d3c4eb73631b0f3fb5b084005... The branch, master has been updated via d3c4eb73631b0f3fb5b08400592f438f0cf71f79 (commit) via 2f2a73beea5e9e66505ba2adba98be83452fc93b (commit) from ea9a2ff01d4ca599215a3bd943f7c5fd55d12f63 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d3c4eb73631b0f3fb5b... commit d3c4eb73631b0f3fb5b08400592f438f0cf71f79 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; Move some beos specific make rules into its MAkefile.target diff --git a/Makefile b/Makefile index 3431ac9..3321086 100644 --- a/Makefile +++ b/Makefile @@ -623,15 +623,6 @@ ifeq ($(TARGET),beos) $(Q)$(BEOS_MIMESET) $(EXETARGET) endif -ifeq ($(TARGET),beos) -$(RDEF_IMP_BEOS): $(RDEP_BEOS) - $(VQ)echo " GEN: $@" - $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ - -$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) - $(VQ)echo " RC: $<" - $(Q)$(BEOS_RC) -I beos -o $@ $^ -endif clean-target: $(VQ)echo " CLEAN: $(EXETARGET)" diff --git a/beos/Makefile.target b/beos/Makefile.target index 478593c..bab6429 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -27,8 +27,6 @@ BEOS_MIMESET := mimeset VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) -RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) -RESOURCES = $(RSRC_BEOS) ifeq ($(HOST),beos) CFLAGS += -I/boot/home/config/include \ @@ -124,6 +122,22 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS) EXETARGET := NetSurf # ---------------------------------------------------------------------------- +# Resources +# ---------------------------------------------------------------------------- + +RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) +RESOURCES = $(RSRC_BEOS) + +$(RDEF_IMP_BEOS): $(RDEP_BEOS) + $(VQ)echo " GEN: $@" + $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ + +$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) + $(VQ)echo " RC: $<" + $(Q)$(BEOS_RC) -I beos -o $@ $^ + + +# ---------------------------------------------------------------------------- # Install target # ---------------------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2f2a73beea5e9e66505... commit 2f2a73beea5e9e66505ba2adba98be83452fc93b Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; Move some RISc OS specific Makefile rules into its Makefile.target diff --git a/Makefile b/Makefile index eef22af..3431ac9 100644 --- a/Makefile +++ b/Makefile @@ -633,39 +633,6 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) $(Q)$(BEOS_RC) -I beos -o $@ $^ endif -ifeq ($(TARGET),riscos) - # Native RO build is different as 1) it can't do piping and 2) ccres on - # RO does not understand Unix filespec - ifeq ($(HOST),riscos) - define compile_template -!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) - $$(VQ)echo "TEMPLATE: $(2)" - $$(Q)$$(CC) -x c -E -P $$(CFLAGS) -o processed_template $(2) - $$(Q)$$(CCRES) processed_template $$(subst /,.,$$@) - $$(Q)$(RM) processed_template -CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) - - endef - else - define compile_template -!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) - $$(VQ)echo "TEMPLATE: $(2)" - $$(Q)mkdir -p !NetSurf/Resources/$(1) - $$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@ -CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) - - endef - endif - -clean-templates: - $(VQ)echo " CLEAN: $(CLEAN_TEMPLATES)" - $(Q)$(RM) $(CLEAN_TEMPLATES) -CLEANS += clean-templates - -$(eval $(foreach TPL,$(TPL_RISCOS), \ - $(call compile_template,$(notdir $(TPL)),$(TPL)))) -endif - clean-target: $(VQ)echo " CLEAN: $(EXETARGET)" $(Q)$(RM) $(EXETARGET) diff --git a/riscos/Makefile.target b/riscos/Makefile.target index dd1c34c..e40795c 100644 --- a/riscos/Makefile.target +++ b/riscos/Makefile.target @@ -20,22 +20,18 @@ $(eval $(call feature_enabled,DRAW,-DWITH_DRAW,,Drawfile rendering)) $(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,Sprite rendering)) $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering)) $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile export)) -ifeq ($(HOST),riscos) - $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) - $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) -else - NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP - NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 - NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 - $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) - $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) - $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) - $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) - $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) -endif + +NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP +NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF +NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG +NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 +NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 +$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) +$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) +$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) + TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ !NetSurf/Resources/$(TPL)/Templates$(TPLEXT)) @@ -85,14 +81,12 @@ S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \ con_fonts.c con_home.c con_image.c con_inter.c con_language.c \ con_secure.c con_theme.c) S_RISCOS := $(addprefix riscos/,$(S_RISCOS)) -TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these -TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS)) - # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS) + EXETARGET := !NetSurf/!RunImage$(EXEEXT) !NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET) @@ -126,6 +120,33 @@ split-messages: .PHONY: split-messages # ---------------------------------------------------------------------------- +# Template targets +# ---------------------------------------------------------------------------- + +# Template objects +TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these +TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS)) + +define compile_template +!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) + $$(VQ)echo "TEMPLATE: $(2)" + $$(Q)mkdir -p !NetSurf/Resources/$(1) + $$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@ + +CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) + +endef + +$(eval $(foreach TPL,$(TPL_RISCOS), \ + $(call compile_template,$(notdir $(TPL)),$(TPL)))) + +clean-templates: + $(VQ)echo " CLEAN: $(CLEAN_TEMPLATES)" + $(Q)$(RM) $(CLEAN_TEMPLATES) +CLEANS += clean-templates + + +# ---------------------------------------------------------------------------- # Install target # ---------------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile | 42 ---------------------------------- beos/Makefile.target | 18 +++++++++++++-- riscos/Makefile.target | 59 ++++++++++++++++++++++++++++++++---------------- 3 files changed, 56 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index eef22af..3321086 100644 --- a/Makefile +++ b/Makefile @@ -623,48 +623,6 @@ ifeq ($(TARGET),beos) $(Q)$(BEOS_MIMESET) $(EXETARGET) endif -ifeq ($(TARGET),beos) -$(RDEF_IMP_BEOS): $(RDEP_BEOS) - $(VQ)echo " GEN: $@" - $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ - -$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) - $(VQ)echo " RC: $<" - $(Q)$(BEOS_RC) -I beos -o $@ $^ -endif - -ifeq ($(TARGET),riscos) - # Native RO build is different as 1) it can't do piping and 2) ccres on - # RO does not understand Unix filespec - ifeq ($(HOST),riscos) - define compile_template -!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) - $$(VQ)echo "TEMPLATE: $(2)" - $$(Q)$$(CC) -x c -E -P $$(CFLAGS) -o processed_template $(2) - $$(Q)$$(CCRES) processed_template $$(subst /,.,$$@) - $$(Q)$(RM) processed_template -CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) - - endef - else - define compile_template -!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) - $$(VQ)echo "TEMPLATE: $(2)" - $$(Q)mkdir -p !NetSurf/Resources/$(1) - $$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@ -CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) - - endef - endif - -clean-templates: - $(VQ)echo " CLEAN: $(CLEAN_TEMPLATES)" - $(Q)$(RM) $(CLEAN_TEMPLATES) -CLEANS += clean-templates - -$(eval $(foreach TPL,$(TPL_RISCOS), \ - $(call compile_template,$(notdir $(TPL)),$(TPL)))) -endif clean-target: $(VQ)echo " CLEAN: $(EXETARGET)" diff --git a/beos/Makefile.target b/beos/Makefile.target index 478593c..bab6429 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -27,8 +27,6 @@ BEOS_MIMESET := mimeset VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) -RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) -RESOURCES = $(RSRC_BEOS) ifeq ($(HOST),beos) CFLAGS += -I/boot/home/config/include \ @@ -124,6 +122,22 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS) EXETARGET := NetSurf # ---------------------------------------------------------------------------- +# Resources +# ---------------------------------------------------------------------------- + +RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) +RESOURCES = $(RSRC_BEOS) + +$(RDEF_IMP_BEOS): $(RDEP_BEOS) + $(VQ)echo " GEN: $@" + $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ + +$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) + $(VQ)echo " RC: $<" + $(Q)$(BEOS_RC) -I beos -o $@ $^ + + +# ---------------------------------------------------------------------------- # Install target # ---------------------------------------------------------------------------- diff --git a/riscos/Makefile.target b/riscos/Makefile.target index dd1c34c..e40795c 100644 --- a/riscos/Makefile.target +++ b/riscos/Makefile.target @@ -20,22 +20,18 @@ $(eval $(call feature_enabled,DRAW,-DWITH_DRAW,,Drawfile rendering)) $(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,Sprite rendering)) $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering)) $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile export)) -ifeq ($(HOST),riscos) - $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) - $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) -else - NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP - NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 - NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 - $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) - $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) - $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) - $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) - $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) -endif + +NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP +NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF +NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG +NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 +NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 +$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) +$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) +$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) + TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ !NetSurf/Resources/$(TPL)/Templates$(TPLEXT)) @@ -85,14 +81,12 @@ S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \ con_fonts.c con_home.c con_image.c con_inter.c con_language.c \ con_secure.c con_theme.c) S_RISCOS := $(addprefix riscos/,$(S_RISCOS)) -TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these -TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS)) - # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS) + EXETARGET := !NetSurf/!RunImage$(EXEEXT) !NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET) @@ -126,6 +120,33 @@ split-messages: .PHONY: split-messages # ---------------------------------------------------------------------------- +# Template targets +# ---------------------------------------------------------------------------- + +# Template objects +TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these +TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS)) + +define compile_template +!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) + $$(VQ)echo "TEMPLATE: $(2)" + $$(Q)mkdir -p !NetSurf/Resources/$(1) + $$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@ + +CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) + +endef + +$(eval $(foreach TPL,$(TPL_RISCOS), \ + $(call compile_template,$(notdir $(TPL)),$(TPL)))) + +clean-templates: + $(VQ)echo " CLEAN: $(CLEAN_TEMPLATES)" + $(Q)$(RM) $(CLEAN_TEMPLATES) +CLEANS += clean-templates + + +# ---------------------------------------------------------------------------- # Install target # ---------------------------------------------------------------------------- -- NetSurf Browser