Update 2 SObjs installation (create links for updated libpng and unnecessary clutter

for libz)

svn path=/trunk/netsurf/; revision=10537
This commit is contained in:
Chris Young 2010-04-30 22:55:44 +00:00
parent 333361eba6
commit 04cb7b3ce1
2 changed files with 36 additions and 8 deletions

42
amiga/dist/Install vendored
View File

@ -71,16 +71,17 @@
)
)
(procedure p_comparesobj #sobj
(procedure p_comparesobj2 #sobj1_full #sobj2_full
(set #same 0)
(set #sobj-version (getversion (tackon "SObjs/" #sobj)))
(set #sobj-version (getversion (#sobj1_full)))
(if (= #sobj-version 0)
(
(if (exists (tackon "SObjs:" #sobj))
(if (exists (#sobj2_full))
(
(set #file-newer (earlier (tackon "SObjs:" #sobj) (tackon "SObjs/" #sobj)))
(set #old-size (getsize (tackon "SObjs:" #sobj)))
(set #new-size (getsize (tackon "SObjs/" #sobj)))
(set #file-newer (earlier (#sobj2_full) (#sobj1_full)))
(set #old-size (getsize (#sobj2_full)))
(set #new-size (getsize (#sobj1_full)))
(if (AND (= #old-size #new-size) (= #file-newer 0)) (set #same 1))
)
@ -88,13 +89,33 @@
)
; else if version info is available
(
(set #sobj-oldversion (getversion (tackon "SObjs:" #sobj)))
(set #sobj-oldversion (getversion (#sobj2_full)))
(if (<= #sobj-version #sobj-oldversion) (set #same 1))
)
)
)
(procedure p_comparesobj #sobj
(set #sobj1 (tackon "SObjs/" #sobj))
(set #sobj2 (tackon "SObjs:" #sobj))
(p_comparesobj2 #sobj1 #sobj2)
)
(procedure p_linksobj #sobj #sobj_link
(set #sobj2 (tackon "SObjs:" #sobj_link))
(p_comparesobj2 (tackon "SObjs/" #sobj) #sobj2)
(if (= #same 0) ;if #sobj is newer than that pointed to by #sobj_link
(
(set #linkcmd (cat "makelink " #sobj2 " SObjs:" #sobj " soft"))
(run #linkcmd)
)
)
)
(procedure p_copysobj #sobj
(set #sobj-version (getversion (tackon "SObjs/" #sobj)))
@ -402,6 +423,13 @@
(p_copysobj @each-name)
(set #complete (+ #complete 3))
)
(working "Creating Shared Objects Links")
(p_linksobj "libz.so.1.2.5" "libz.so")
(p_linksobj "libz.so.1.2.5" "libz.so.1")
(p_linksobj "libz.so.1.2.5" "libz.so.1.2")
(p_linksobj "libpng14.so.14" "libpng.so")
)
)

View File

@ -20,6 +20,6 @@ copy amiga/pkg/fitr ram:NetSurf/
makedir ram:NetSurf/Rexx
copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
makedir ram:NetSurf/SObjs
copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so ram:NetSurf/SObjs clone
copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libpng14.so.14 ram:NetSurf/SObjs clone
;sobjs:libssl-0.9.8.so sobjs:libexpat.so
;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so