Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/19d2a0c01185451d2e2903f116f792e591b8ff5f
...commit
http://git.netsurf-browser.org/netsurf.git/commit/19d2a0c01185451d2e2903f116f792e591b8ff5f
...tree
http://git.netsurf-browser.org/netsurf.git/tree/19d2a0c01185451d2e2903f116f792e591b8ff5f
The branch, master has been updated
via 19d2a0c01185451d2e2903f116f792e591b8ff5f (commit)
via 8e4819e450f5922cde793477c634df9c82c21fb6 (commit)
via b122d0be7b97ba0630559f48a6b85eeb1a757983 (commit)
via 45e536d9618c7a8a835c85ffb884f734b67e8511 (commit)
via 9867da4935093007a63818a0125ad522753d13a6 (commit)
from eb35a576c1b5845d4aa6b2b77d8039f49f048edc (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/19d2a0c01185451d2e2903f116f792e591b8ff5f
commit 19d2a0c01185451d2e2903f116f792e591b8ff5f
Merge: 8e4819e eb35a57
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/8e4819e450f5922cde793477c634df9c82c21fb6
commit 8e4819e450f5922cde793477c634df9c82c21fb6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Snapshot icon positions so they default to looking neat when the archive is
extracted.
diff --git a/amiga/dist/Install.info b/amiga/dist/Install.info
index 477ee2e..944fcc6 100644
Binary files a/amiga/dist/Install.info and b/amiga/dist/Install.info differ
diff --git a/amiga/dist/NetSurf.guide.info b/amiga/dist/NetSurf.guide.info
index fedb27f..d6d529d 100644
Binary files a/amiga/dist/NetSurf.guide.info and
b/amiga/dist/NetSurf.guide.info differ
diff --git a/amiga/dist/Rexx.info b/amiga/dist/Rexx.info
index 2cb1357..908b018 100644
Binary files a/amiga/dist/Rexx.info and b/amiga/dist/Rexx.info differ
diff --git a/amiga/dist/netsurf.readme.info b/amiga/dist/netsurf.readme.info
index d6fb397..c0ee5ff 100644
Binary files a/amiga/dist/netsurf.readme.info and
b/amiga/dist/netsurf.readme.info differ
diff --git a/amiga/pkg/drawer.info b/amiga/pkg/drawer.info
index 4b41433..0a9548a 100644
Binary files a/amiga/pkg/drawer.info and b/amiga/pkg/drawer.info differ
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/b122d0be7b97ba0630559f48a6b85eeb1a757983
commit b122d0be7b97ba0630559f48a6b85eeb1a757983
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
fix Installer script for auto-builds
diff --git a/amiga/dist/Install b/amiga/dist/Install
index c3d5af2..e794939 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -283,7 +283,7 @@
(if (= @default-dest "")
(
; Workaround for Installer bug picking TEXTCLIP: as a sensible
location
- (if (= @default-dest "TextClip:") (set @default-dest
"SYS:Utilities"))
+ (if (= @default-dest "TextClip:") (set @default-dest
"SYS:Internet"))
(if (= @user-level 0)
(
@@ -297,7 +297,7 @@
(set @default-dest
(askdir
(prompt "Where would you like to install NetSurf?\n"
- "(a drawer will not be created)")
+ "(a drawer WILL NOT be created)")
(help @askdir-help)
(default @default-dest)
)
@@ -311,6 +311,9 @@
(set osver (/ osver 65536))
(set #versions-available 0)
+(set #static-filename "NetSurf-Static")
+(set #cairo-filename "NetSurf")
+
(if (exists "NetSurf-Static")
(
(set #static-name "Static/graphics.library")
@@ -322,11 +325,32 @@
)
)
-(if (AND (>= osver 53) (exists "NetSurf"))
+(if (exists "NetSurf")
(
- (set #cairo-name "Shared objects/part-Cairo")
- (set #versions-available (+ #versions-available 1))
- (set #cairo-version 1)
+ (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
(
@@ -421,7 +445,7 @@
(complete 20)
-(set #netsurf-name (select #cairo-version "NetSurf-Static" "NetSurf"))
+(set #netsurf-name (select #cairo-version #static-filename #cairo-filename))
(if (= #AutoInstall 0)
(
@@ -482,10 +506,14 @@
(set #complete 40)
(working "Copying Libraries")
-(foreach "Libs" "#?"
- (complete #complete)
- (p_copylib @each-name)
- (set #complete (+ #complete 2))
+(if (exists "Libs")
+ (
+ (foreach "Libs" "#?"
+ (complete #complete)
+ (p_copylib @each-name)
+ (set #complete (+ #complete 2))
+ )
+ )
)
(set #complete 60)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/45e536d9618c7a8a835c85ffb884f734b67e8511
commit 45e536d9618c7a8a835c85ffb884f734b67e8511
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
pedantic makefile spacing
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 6bfca7a..c8046b4 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -124,12 +124,12 @@ netsurf.lha: NetSurf
$(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
$(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
- ifeq ($(HOST),amiga)
+ ifeq ($(HOST),amiga)
$(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs
$(Q)cp $(AMIGA_LIBS) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs
$(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs
$(Q)cp --preserve=timestamps $(AMIGA_SOBJS)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs
- endif
+ endif
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/9867da4935093007a63818a0125ad522753d13a6
commit 9867da4935093007a63818a0125ad522753d13a6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
add install files required for Cairo build. (native build only)
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 3ff3f9b..6bfca7a 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -101,6 +101,10 @@ AMIGA_LANGUAGES := de en fr it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info
favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle
AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES))
$(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
+AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library
iconv.library hubbub.library
+AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES))
+AMIGA_SHARED_OBJS := libjpeg.so.8 libxml2.so.9 libcurl.so.7 librtmp.so.0
libsvgtiny.so.0 libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0
libwapcaplet.so.0 libpng12.so libdom.so.0 libhubbub.so.0
+AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
AMIGA_DISTRIBUTION_FILES := amiga/dist/*
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
@@ -116,10 +120,16 @@ netsurf.lha: NetSurf
$(Q)cp \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
$(Q)cp \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
$(Q)cp \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
- $(Q)cp \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
+ $(Q)cp \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
$(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
$(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
+ ifeq ($(HOST),amiga)
+ $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs
+ $(Q)cp $(AMIGA_LIBS) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs
+ $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs
+ $(Q)cp --preserve=timestamps $(AMIGA_SOBJS)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs
+ endif
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
-----------------------------------------------------------------------
Summary of changes:
amiga/Makefile.target | 10 ++++++++
amiga/dist/Install | 50 +++++++++++++++++++++++++++++++--------
amiga/dist/Install.info | Bin 8892 -> 8892 bytes
amiga/dist/NetSurf.guide.info | Bin 6741 -> 6741 bytes
amiga/dist/Rexx.info | Bin 6206 -> 6206 bytes
amiga/dist/netsurf.readme.info | Bin 6238 -> 6238 bytes
amiga/pkg/drawer.info | Bin 17208 -> 17208 bytes
7 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 2a821ba..c8046b4 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -101,6 +101,10 @@ AMIGA_LANGUAGES := de en fr it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info
favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle
AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES))
$(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
+AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library
iconv.library hubbub.library
+AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES))
+AMIGA_SHARED_OBJS := libjpeg.so.8 libxml2.so.9 libcurl.so.7 librtmp.so.0
libsvgtiny.so.0 libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0
libwapcaplet.so.0 libpng12.so libdom.so.0 libhubbub.so.0
+AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
AMIGA_DISTRIBUTION_FILES := amiga/dist/*
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
@@ -120,6 +124,12 @@ netsurf.lha: NetSurf
$(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
$(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
+ ifeq ($(HOST),amiga)
+ $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs
+ $(Q)cp $(AMIGA_LIBS) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs
+ $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs
+ $(Q)cp --preserve=timestamps $(AMIGA_SOBJS)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs
+ endif
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
diff --git a/amiga/dist/Install b/amiga/dist/Install
index c3d5af2..e794939 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -283,7 +283,7 @@
(if (= @default-dest "")
(
; Workaround for Installer bug picking TEXTCLIP: as a sensible
location
- (if (= @default-dest "TextClip:") (set @default-dest
"SYS:Utilities"))
+ (if (= @default-dest "TextClip:") (set @default-dest
"SYS:Internet"))
(if (= @user-level 0)
(
@@ -297,7 +297,7 @@
(set @default-dest
(askdir
(prompt "Where would you like to install NetSurf?\n"
- "(a drawer will not be created)")
+ "(a drawer WILL NOT be created)")
(help @askdir-help)
(default @default-dest)
)
@@ -311,6 +311,9 @@
(set osver (/ osver 65536))
(set #versions-available 0)
+(set #static-filename "NetSurf-Static")
+(set #cairo-filename "NetSurf")
+
(if (exists "NetSurf-Static")
(
(set #static-name "Static/graphics.library")
@@ -322,11 +325,32 @@
)
)
-(if (AND (>= osver 53) (exists "NetSurf"))
+(if (exists "NetSurf")
(
- (set #cairo-name "Shared objects/part-Cairo")
- (set #versions-available (+ #versions-available 1))
- (set #cairo-version 1)
+ (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
(
@@ -421,7 +445,7 @@
(complete 20)
-(set #netsurf-name (select #cairo-version "NetSurf-Static" "NetSurf"))
+(set #netsurf-name (select #cairo-version #static-filename #cairo-filename))
(if (= #AutoInstall 0)
(
@@ -482,10 +506,14 @@
(set #complete 40)
(working "Copying Libraries")
-(foreach "Libs" "#?"
- (complete #complete)
- (p_copylib @each-name)
- (set #complete (+ #complete 2))
+(if (exists "Libs")
+ (
+ (foreach "Libs" "#?"
+ (complete #complete)
+ (p_copylib @each-name)
+ (set #complete (+ #complete 2))
+ )
+ )
)
(set #complete 60)
diff --git a/amiga/dist/Install.info b/amiga/dist/Install.info
index 477ee2e..944fcc6 100644
Binary files a/amiga/dist/Install.info and b/amiga/dist/Install.info differ
diff --git a/amiga/dist/NetSurf.guide.info b/amiga/dist/NetSurf.guide.info
index fedb27f..d6d529d 100644
Binary files a/amiga/dist/NetSurf.guide.info and
b/amiga/dist/NetSurf.guide.info differ
diff --git a/amiga/dist/Rexx.info b/amiga/dist/Rexx.info
index 2cb1357..908b018 100644
Binary files a/amiga/dist/Rexx.info and b/amiga/dist/Rexx.info differ
diff --git a/amiga/dist/netsurf.readme.info b/amiga/dist/netsurf.readme.info
index d6fb397..c0ee5ff 100644
Binary files a/amiga/dist/netsurf.readme.info and
b/amiga/dist/netsurf.readme.info differ
diff --git a/amiga/pkg/drawer.info b/amiga/pkg/drawer.info
index 4b41433..0a9548a 100644
Binary files a/amiga/pkg/drawer.info and b/amiga/pkg/drawer.info differ
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
