diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-05-03 16:38:58 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-05-03 16:38:58 +0100 |
commit | b1f67dab31f5f5ccba4f637adfad17370b2f1d13 (patch) | |
tree | 18a94b18dd729f614dd90c468986fc49f5b3062d /amiga/dist | |
parent | 0c5c7159d82b8dd6d694ae867c84ff58aa470764 (diff) | |
download | netsurf-b1f67dab31f5f5ccba4f637adfad17370b2f1d13.tar.gz netsurf-b1f67dab31f5f5ccba4f637adfad17370b2f1d13.tar.bz2 |
Remove Cairo from AmigaOS frontend.
Diffstat (limited to 'amiga/dist')
-rwxr-xr-x | amiga/dist/Install | 118 | ||||
-rwxr-xr-x | amiga/dist/NetSurf.guide | 3 |
2 files changed, 15 insertions, 106 deletions
diff --git a/amiga/dist/Install b/amiga/dist/Install index 61defec03..a80404ec6 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -309,72 +309,9 @@ (set #icon-exists (exists (tackon @default-dest "NetSurf.info"))) (set osver (getversion)) (set osver (/ osver 65536)) -(set #versions-available 0) - -(set #static-filename "NetSurf") -(set #cairo-filename "NetSurf") - -(if (exists "NetSurf") - ( - (if (exists "SObjs") - ( - (if (>= osver 53) - ( - (set #cairo-name "Shared objects/part-Cairo") - (set #versions-available (+ #versions-available 1)) - (set #cairo-version 1) - ) - ;else - ( - (set #cairo-version 0) - (set #cairo-name "") - ) - ) - ) - ;else - ( - ; assume static if sobjs is not present - (set #static-name "Static/graphics.library") - (set #versions-available (+ #versions-available 1)) - (set #cairo-version 0) - (set #static-filename "NetSurf") - ) - ) - ) - ; else - ( - (set #cairo-version 0) - (set #cairo-name "") - ) -) - -(transcript "Versions avaiable for install: " #versions-available " " #static-name " " #cairo-name) - -(if (= #versions-available 0) - ( - (abort "Did not find any compatible versions of NetSurf to install!\n\n" - "NetSurf requires AmigaOS 4.1 or higher.") - ) -) (complete 10) -(if (AND (> @user-level 0) (> #versions-available 1)) - ( - (set #cairo-version - (askchoice - (prompt "Which version of NetSurf would you like to install?") - (help "The Cairo version has anti-aliasing of graphical elements.\n\n" - @askchoice-help) - (choices #static-name #cairo-name) - (default #cairo-version) - ) - ) - ) -) - -(complete 15) - (set #user (getenv "user")) (if (= #user "") (set #user "Default")) @@ -415,7 +352,7 @@ ) ) -(complete 18) +(complete 15) (if (>= osver 53) ( @@ -436,7 +373,7 @@ ) ) -(complete 19) +(complete 20) (set #runfixfonts (askbool @@ -449,9 +386,7 @@ ) ) -(complete 20) - -(set #netsurf-name (select #cairo-version #static-filename #cairo-filename)) +(complete 25) (working "Installing NetSurf") @@ -460,7 +395,7 @@ (copyfiles (prompt "Copying NetSurf...") (help @copyfiles-help) - (source #netsurf-name) + (source "NetSurf") (dest @default-dest) (newname "NetSurf") (optional "askuser" "force" "oknodelete") @@ -473,7 +408,7 @@ ) ) -(complete 30) +(complete 40) (if #searchengines-exist (rename (tackon @default-dest "Resources/SearchEngines") (tackon @default-dest "Resources/SearchEngines.backup")) @@ -483,6 +418,8 @@ (run "c:filenote Rexx/ViewSource.nsrx \"View source\"") (run "c:filenote Rexx/GetVideo.nsrx \"Get video\"") +(complete 50) + (copyfiles (prompt "Copying files") (source "") @@ -494,6 +431,8 @@ ; (all) ) +(complete 65) + (copyfiles (prompt "Copying additional documentation") (source "") @@ -504,34 +443,7 @@ (optional "nofail") ) -(set #complete 40) -(working "Copying Libraries") - -(if (exists "Libs") - ( - (foreach "Libs" "#?" - (complete #complete) - (p_copylib @each-name) - (set #complete (+ #complete 2)) - ) - ) -) - -(set #complete 60) - -(if (= #cairo-version 1) - ( - (working "Copying Shared Objects") - - (foreach "SObjs" "#?" - (complete #complete) - (p_copysobj @each-name) - (set #complete (+ #complete 1)) - ) - ) -) - -(complete 90) +(complete 70) (if #themeshort ( @@ -578,7 +490,7 @@ ) ) -(complete 95) +(complete 75) (if (= (exists "ENVARC:Sys/def_css.info") 0) (copyfiles @@ -591,7 +503,7 @@ ) ) -(complete 96) +(complete 80) (working "Setting MIME types") (p_setmimetype "css" "text/css") @@ -611,7 +523,7 @@ (p_setmimetype "zip" "application/x-zip") (p_setmimetype "js" "application/javascript") -(complete 97) +(complete 85) (if (>= osver 53) (if (= (exists "Rexx:NetSurf") 0) @@ -659,7 +571,7 @@ ) ) -(complete 98) +(complete 90) (if (= #addlaunchhandler 1) ( @@ -691,7 +603,7 @@ ) ) -(complete 99) +(complete 95) (working "Running FixFonts") diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide index 5aaf60aa3..f01ee849b 100755 --- a/amiga/dist/NetSurf.guide +++ b/amiga/dist/NetSurf.guide @@ -121,7 +121,6 @@ There are a couple of Amiga-specific options which can only be changed directly @{b}kiosk_mode@{ub} No gadgets @{b}printer_unit@{ub} Specifies which printer.device unit to print to @{b}drag_save_icons@{ub} Enables displaying Workbench-style transparent icons under the pointer when performing drag saves (ctrl-drag of objects available if NetSurf is running on the Workbench screen) and text selection drags. If set to 0 the pointer style will change instead. OS 4.0 users may want to set this to 0 as icons will appear opaque and obscure the drop position. -@{b}cairo_renderer@{ub} Set rendering engine. -1 = palette-mapped (set automatically when required), 0 = graphics.library (default), 1 = Cairo/graphics.library mixed, 2 = Full Cairo. @{b}monitor_aspect_x@{ub}/@{b}monitor_aspect_y@{ub} Correct aspect ratio for displays (default of 0 means "assume square pixels"). @{b}screen_compositing@{ub} Use compositing on NetSurf's own screen. 0=disable, 1=enable, 2=default (NB: This is indirectly modified by changing the "simple refresh" option in the GUI) @{b}resize_with_contents@{ub} Set to 1 to respect GUI prefs' "resize with contents" option. Default is to use old-style "resize on release" @@ -372,8 +371,6 @@ There are a number of options which can be changed that will affect the speed of @{b}Cache native versions@{ub} to @{b}Scaled@{ub} (or preferably @{b}All@{ub}, but this will use more graphics mem, and scaling images is a bigger performance hit) Deselect @{b}Higher quality scaling@{ub}, this will be very slow if not done in hardware.@{lindent} -@{lindent 2}* In @{"Options" link Options}, set cairo_renderer:1@{lindent} - @{lindent 2}* In @{"Options" link Options}, increase redraw_tile_size_x/y (increasing this value uses more graphics mem)@{lindent} @{lindent 2}* In @{"Options" link Options}, set font_antialiasing:0@{lindent} |