Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7c737252e0ce7276b132b... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7c737252e0ce7276b132b46... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7c737252e0ce7276b132b4634... The branch, master has been updated via 7c737252e0ce7276b132b4634dc615ddad508698 (commit) via cfdf28ac93a11bc86b609d1f27277a20424d5a27 (commit) from af2d9e8906d1d439c0c4319298843c40047dd256 (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/commitdiff/7c737252e0ce7276b13... commit 7c737252e0ce7276b132b4634dc615ddad508698 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix AutoInstall diff --git a/amiga/dist/Install b/amiga/dist/Install index 039ccbf..5fabf3e 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -311,20 +311,9 @@ (set osver (/ osver 65536)) (set #versions-available 0) -(set #static-filename "NetSurf-Static") +(set #static-filename "NetSurf") (set #cairo-filename "NetSurf") -(if (exists "NetSurf-Static") - ( - (set #static-name "Static/graphics.library") - (set #versions-available (+ #versions-available 1)) - ) - ; else - ( - (set #static-name "") - ) -) - (if (exists "NetSurf") ( (if (exists "SObjs") @@ -375,8 +364,7 @@ (set #cairo-version (askchoice (prompt "Which version of NetSurf would you like to install?") - (help "The Cairo/shared objects version has better rendering " - "of some graphical elements, and supports SVG.\n\n" + (help "The Cairo version has anti-aliasing of graphical elements.\n\n" @askchoice-help) (choices #static-name #cairo-name) (default #cairo-version) @@ -474,18 +462,7 @@ ) ;else ( - (copyfiles - (prompt "Please check the version of NetSurf you are copying against " - "any which might already be installed.") - (help @copyfiles-help) - (source #netsurf-name) - (dest "T:") - (newname "NetSurf") - (optional "force" "oknodelete") - ) - - (run "CopyStore T:NetSurf" @default-dest) - (delete "T:NetSurf") + (run "CopyStore NetSurf" @default-dest) ) ) commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/cfdf28ac93a11bc86b6... commit cfdf28ac93a11bc86b609d1f27277a20424d5a27 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Drop the two different names for the executable diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 61de77b..4cd76cf 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -39,9 +39,6 @@ ifeq ($(HOST),amiga) ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES) CFLAGS += -I /SDK/local/common/include/cairo LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat - EXETARGET := NetSurf - else - EXETARGET := NetSurf-Static endif else $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite)) @@ -66,18 +63,14 @@ else else LDFLAGS += -lauto -lpbl -liconv endif - - ifeq ($(NETSURF_AMIGA_CAIRO_AVAILABLE),yes) - EXETARGET := NetSurf - else - EXETARGET := NetSurf-Static - endif endif ifeq ($(NETSURF_USE_MOZJS),YES) NETSURF_USE_JS:=YES endif +EXETARGET := NetSurf + # ---------------------------------------------------------------------------- # Source file setup # ---------------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: amiga/Makefile.target | 11 ++--------- amiga/dist/Install | 29 +++-------------------------- 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 61de77b..4cd76cf 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -39,9 +39,6 @@ ifeq ($(HOST),amiga) ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES) CFLAGS += -I /SDK/local/common/include/cairo LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat - EXETARGET := NetSurf - else - EXETARGET := NetSurf-Static endif else $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite)) @@ -66,18 +63,14 @@ else else LDFLAGS += -lauto -lpbl -liconv endif - - ifeq ($(NETSURF_AMIGA_CAIRO_AVAILABLE),yes) - EXETARGET := NetSurf - else - EXETARGET := NetSurf-Static - endif endif ifeq ($(NETSURF_USE_MOZJS),YES) NETSURF_USE_JS:=YES endif +EXETARGET := NetSurf + # ---------------------------------------------------------------------------- # Source file setup # ---------------------------------------------------------------------------- diff --git a/amiga/dist/Install b/amiga/dist/Install index 039ccbf..5fabf3e 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -311,20 +311,9 @@ (set osver (/ osver 65536)) (set #versions-available 0) -(set #static-filename "NetSurf-Static") +(set #static-filename "NetSurf") (set #cairo-filename "NetSurf") -(if (exists "NetSurf-Static") - ( - (set #static-name "Static/graphics.library") - (set #versions-available (+ #versions-available 1)) - ) - ; else - ( - (set #static-name "") - ) -) - (if (exists "NetSurf") ( (if (exists "SObjs") @@ -375,8 +364,7 @@ (set #cairo-version (askchoice (prompt "Which version of NetSurf would you like to install?") - (help "The Cairo/shared objects version has better rendering " - "of some graphical elements, and supports SVG.\n\n" + (help "The Cairo version has anti-aliasing of graphical elements.\n\n" @askchoice-help) (choices #static-name #cairo-name) (default #cairo-version) @@ -474,18 +462,7 @@ ) ;else ( - (copyfiles - (prompt "Please check the version of NetSurf you are copying against " - "any which might already be installed.") - (help @copyfiles-help) - (source #netsurf-name) - (dest "T:") - (newname "NetSurf") - (optional "force" "oknodelete") - ) - - (run "CopyStore T:NetSurf" @default-dest) - (delete "T:NetSurf") + (run "CopyStore NetSurf" @default-dest) ) ) -- NetSurf Browser