Show which build we are using, modify install script to give an option of which build

needs to be installed, and do date-compare when copying shared objects if they have no
version string.

svn path=/trunk/netsurf/; revision=6590

3 files changed, 219 insertions, 14 deletions

diff --git a/amiga/dist/Install b/amiga/dist/Install
index 62970a43b..378b7b2d6 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -13,6 +13,96 @@
 	)
 )
 
+(procedure p_copysobj #sobj
+	(set #sobj-version (getversion (tackon "SObjs/" #sobj)))
+
+	(if (<> #sobj-version 0)
+		(
+			(transcript "Date compare copy " #sobj)
+
+			(if (exists (tackon "SObjs:" #sobj))
+				(
+					(set #file-newer (earlier (tackon "SObjs:" #sobj) (tackon "SObjs/" #sobj)))
+
+					(if (= #file-newer 0)
+						(
+							(set #newer-text "has an older datestamp")
+						)
+						;else
+						(
+							(set #newer-text "has a newer datestamp")
+						)
+					)
+
+					(set #old-size (getsize (tackon "SObjs:" #sobj)))
+					(set #new-size (getsize (tackon "SObjs/" #sobj)))
+
+					(if (AND (= #old-size #new-size) (= #file-newer 0))
+						(
+							(set #copy 0)
+						)
+						;else
+						(
+							(if (OR (= @user-level 2) (AND (= @user-level 1) (<> #file-newer 0)))
+; Expert users are always prompted
+; Average users are prompted if the file trying to be copied is newer
+; Novice users are never prompted
+; This is roughly equivalent to (copylib (confirm))
+; No prompting occurs if the destination does not exist (silent copy)
+; or the files are the same size and the one being copied isn't newer (don't copy)
+								(
+									(set #copy
+										(askbool
+											(prompt "Copying " #sobj "...\n\n"
+												"Version to install: " #new-size " bytes\n"
+												"Version currently installed: " #old-size " bytes\n\n"
+												"The file to copy " #newer-text)
+											(help @askbool-help)
+											(default #file-newer)
+											(choices "Proceed with copy" "Skip this part")
+										)
+									)
+								)
+								;else
+								(
+									(set #copy #file-newer)
+								)
+							)
+						)
+					)
+				)
+				; else if dest file does not exist
+				(
+					(set #copy 1)
+				)
+			)
+
+			(if (<> #copy 0)
+				(
+					(copyfiles
+						(prompt "Copying " #sobj "...")
+						(help @copyfiles-help)
+						(source (tackon "SObjs/" #sobj))
+						(dest "SObjs:")
+						(optional "nofail" "force")
+					)
+				)
+			)
+		)
+		; else if version info is available
+		(
+			(copylib
+				(prompt "Copying " #sobj "...")
+				(help @copylib-help)
+				(source (tackon "SObjs/" #sobj))
+				(dest "SObjs:")
+				(optional "nofail" "force")
+				(confirm)
+			)
+		)
+	)
+)
+
 (if (= @app-name "NetSurfAutoInstall") (set #AutoInstall 1))
 
 (if (<> #AutoInstall 1) (welcome))
@@ -29,22 +119,87 @@
 	)
 )
 
+(working "Checking existing installation...")
 (set #icon-exists (exists (tackon @default-dest "NetSurf.info")))
+(set osver (getversion))
+(set osver (/ osver 65536))
+
+(if (>= osver 53)
+	(
+		(if (= #AutoInstall 0)
+			(
+				(set #cairo-name "Shared objects/part-Cairo")
+			)
+			;else
+			(
+				(set #cairo-name "")
+			)
+		)
+		(set #cairo-version 1)
+		(set #netsurf-exists (exists (tackon @default-dest "NetSurf")))
+		(if (<> #netsurf-exists 0)
+			(
+				(set #netsurf-size (getsize (tackon @default-dest "NetSurf")))
 
-; *****************************************************
-; TODO: Check OS version/existing build and provide
-; option to select graphics.library or part-Cairo build.
-; ****************************************************
+		; This loop checks the installed version of NetSurf against known
+		; filesizes for non-Cairo versions.  This isn't great as self-compiled
+		; or non-release builds won't be picked up.
+		; Below only contains latest dev snapshot as that is all I can find out.
+		; Additional sizes can be added "1234" "5678" etc
+		; We might be able to guess as the static build is always bigger (>8MB?)
 
-(copylib
-	(prompt "Please check the version of NetSurf you are copying against "
-			"any which might already be installed.")
-	(help @copylib-help)
-	(source "NetSurf")
-	(dest @default-dest)
-	(infos)
-	(optional "askuser" "force" "oknodelete")
-	(confirm "expert")
+				(set #loop 0)
+				(while (set #compare-size (select #loop "9646743"))
+					(
+						(set #loop (+ #loop 1))
+						(if (= #netsurf-size #compare-size) (set #cairo-version 0))
+					)
+				)
+			)
+		)
+	)
+	; else
+	(
+		(set #cairo-version 0)
+		(set #cairo-name "")		
+	)
+)
+
+(if (AND (> @user-level 0) (<> #cairo-name ""))
+	(
+		(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.  However, "
+					"some users report problems with the use of shared objects.\n\n"
+					@askchoice-help)
+				(choices "Static/graphics.library" #cairo-name)
+				(default #cairo-version)
+			)
+		)
+	)
+)
+
+(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf_Cairo"))
+
+(if (= #AutoInstall 0)
+	(
+		(copylib
+			(prompt "Please check the version of NetSurf you are copying against "
+					"any which might already be installed.")
+			(help @copylib-help)
+			(source #netsurf-name)
+			(dest @default-dest)
+			(infos)
+			(optional "askuser" "force" "oknodelete")
+			(confirm "expert")
+		)
+	)
+;else
+	(
+		(run "CopyStore " #netsurf-name " " @default-dest)
+	)
 )
 
 (complete 20)
@@ -59,6 +214,27 @@
 ;	(all)
 )
 
+(complete 50)
+
+(if (= #cairo-version 1)
+	(
+		(working "Copying Shared Objects")
+
+		(p_copysobj "libc.so")
+		(p_copysobj "libgcc.so")
+		(p_copysobj "libjpeg.so")
+		(p_copysobj "libpthread.so")
+
+		; This is only needed for Cairo, but we have a newer version so why not?
+		(p_copysobj "libexpat.so")
+
+		; Following two are included with OS4.1
+		; until I have something newer they aren't in the archive
+		;(p_sodatecopy "libcurl-7.16.so")
+		;(p_sodatecopy "libssl-0.9.8.so")
+	)
+)
+
 (complete 70)
 
 (set #options-exist (exists (tackon @default-dest "Resources/Options")))
diff --git a/amiga/menu.c b/amiga/menu.c
index a97045336..93f5380b5 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -528,10 +528,15 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
 						TDR_TitleString,messages_get("NetSurf"),
 						TDR_Window,gwin->win,
 						TDR_GadgetString,messages_get("OK"),
-						TDR_FormatString,"NetSurf %s\n%s (%s)\n\nhttp://www.netsurf-browser.org",
+						TDR_FormatString,"NetSurf %s\n%s (%s) %s\n\nhttp://www.netsurf-browser.org",
 						TDR_Arg1,netsurf_version,
 						TDR_Arg2,versvn,
 						TDR_Arg3,verdate,
+#ifdef NS_AMIGA_CAIRO
+						TDR_Arg4,"Cairo",
+#else
+						TDR_Arg4,"",
+#endif
 						TAG_DONE);
 
 					ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
new file mode 100755
index 000000000..0edf51590
--- /dev/null
+++ b/amiga/pkg/makepackage
@@ -0,0 +1,24 @@
+makedir ram:NetSurf/Resources ALL
+cd files:projects/netsurf_svn/netsurf
+list resources LFORMAT="copy %f%n ram:netsurf/resources followlinks" files >t:nslinks
+list resources LFORMAT="makedir ram:netsurf/resources/%n" dirs >>t:nslinks
+list resources/~(Pointers|Themes) LFORMAT="copy %f%n/Messages ram:netsurf/resources/%n/Messages followlinks" dirs >>t:nslinks
+list resources/Themes/~(.svn) LFORMAT="makedir ram:netsurf/resources/Themes/%n" dirs >>t:nslinks
+list resources/Themes/~(.svn) LFORMAT="copy %f%n/~(.svn) ram:netsurf/resources/Themes/%n/" dirs >>t:nslinks
+execute t:nslinks
+delete t:nslinks
+delete ram:netsurf/resources/hotlist
+delete ram:netsurf/resources/cookies
+delete ram:netsurf/resources/urls
+delete ram:netsurf/resources/options
+copy resources/Pointers/~(.svn) ram:NetSurf/Resources/Pointers
+copy COPYING ram:NetSurf/
+copy NetSurf ram:NetSurf/NetSurf
+copy NetSurf_Cairo ram:NetSurf/NetSurf_Cairo
+copy amiga/dist/AutoInstall ram:
+copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/
+makedir ram:NetSurf/Rexx
+copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
+makedir ram:NetSurf/SObjs
+copy sobjs:libgcc.so sobjs:libc.so sobjs:libjpeg.so sobjs:libpthread.so sobjs:libexpat.so ram:NetSurf/SObjs clone
+;sobjs:libcurl-7.16.so sobjs:libssl-0.9.8.so