Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/607c06c96d0215f383d271afa92e1cfbeb4f50c7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/607c06c96d0215f383d271afa92e1cfbeb4f50c7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/607c06c96d0215f383d271afa92e1cfbeb4f50c7
The branch, master has been updated
via 607c06c96d0215f383d271afa92e1cfbeb4f50c7 (commit)
via d97eb2f52054e8f77adb16d2a8afbf5fd0e576a1 (commit)
from 836c13f87d792f074c6c5ad7a3da3fa8f7237175 (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/607c06c96d0215f383d271afa92e1cfbeb4f50c7
commit 607c06c96d0215f383d271afa92e1cfbeb4f50c7
Author: Ole Loots <[email protected]>
Commit: Ole Loots <[email protected]>
Implemented atari-package target
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 283d634..edc8ce3 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -86,15 +86,28 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
# Install target
# ----------------------------------------------------------------------------
-ATARI_INSTALL_TARGET_DIR := nsatari.package
-ATARI_RES_DIR := atari/res
+ATARI_TARGET_DIR := netsurf/
+ATARI_RES_DIR := atari/res/
+ATARI_DOC_DIR := atari/doc/
+ATARI_FONT_SOURCE_DIR := /usr/share/fonts/truetype/ttf-bitstream-vera/
+ATARI_FONT_DOC_DIR := /usr/share/doc/ttf-bitstream-vera/
+
+ifeq ($(HOST),mint)
+ STRIP := strip
+ STACK := stack
+endif
+
+ifneq ($(HOST),mint)
+ STRIP := m68k-atari-mint-strip
+ STACK := m68k-atari-mint-stack
+endif
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
-install-atari:
+install-atari:
# ----------------------------------------------------------------------------
# Package target
@@ -104,17 +117,59 @@ package-atari: $(PKGNAME)
$(VQ)echo Creating $(PKGNAME)
$(PKGNAME): $(EXETARGET)
- $(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR)
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts
- #$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons
- $(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies
- $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc
$(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc
- $(Q)cp $(ATARI_RES_DIR)/icons/
$(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R
-
-
- $(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf
+ $(Q)$(STRIP) $(EXETARGET)
+ $(Q)$(STACK) -S 256k $(EXETARGET)
+ $(Q)rm -rf $(ATARI_TARGET_DIR)
+ $(Q)rm -rf $(PKGNAME)
+ $(Q)mkdir $(ATARI_TARGET_DIR)
+ $(Q)mkdir $(ATARI_TARGET_DIR)doc
+ $(Q)mkdir $(ATARI_TARGET_DIR)download
+ $(Q)mkdir $(ATARI_TARGET_DIR)res
+ $(Q)mkdir $(ATARI_TARGET_DIR)res/fonts
+ $(Q)mkdir $(ATARI_TARGET_DIR)res/icons
+ $(Q)touch $(ATARI_TARGET_DIR)cookies
+ $(Q)touch $(ATARI_TARGET_DIR)url.db
+
+ $(Q)cp $(ATARI_DOC_DIR)bugs $(ATARI_TARGET_DIR)doc/
+ $(Q)cp $(ATARI_DOC_DIR)faq.txt $(ATARI_TARGET_DIR)doc/
+ $(Q)cp $(ATARI_DOC_DIR)readme.txt $(ATARI_TARGET_DIR)doc/
+ $(Q)cp $(ATARI_DOC_DIR)todo.txt $(ATARI_TARGET_DIR)doc/
+
+# GUI resources:
+ $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_TARGET_DIR)res/netsurf.rsc
+ $(Q)cp $(ATARI_RES_DIR)/icons -R $(ATARI_TARGET_DIR)res/icons
+ $(Q)cp \!NetSurf/Resources/Icons/content.png -R
$(ATARI_TARGET_DIR)res/icons/
+ $(Q)cp \!NetSurf/Resources/Icons/directory.png -R
$(ATARI_TARGET_DIR)res/icons/dir.png
+
+ $(Q)cp \!NetSurf/Resources/AdBlock,f79
$(ATARI_TARGET_DIR)res/adblock.css
+ $(Q)cp \!NetSurf/Resources/CSS,f79 $(ATARI_TARGET_DIR)res/default.css
+ $(Q)cp \!NetSurf/Resources/Quirks,f79 $(ATARI_TARGET_DIR)res/quirks.css
+ $(Q)cp \!NetSurf/Resources/internal.css,f79
$(ATARI_TARGET_DIR)res/internal.css
+ $(Q)cp \!NetSurf/Resources/SearchEngines $(ATARI_TARGET_DIR)res/search
+ $(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
+ $(Q)cp resources/FatMessages $(ATARI_TARGET_DIR)res/messages
+ $(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
+
+# copy "Bitstream Vera" font:
+ $(Q)cp $(ATARI_FONT_DOC_DIR)copyright $(ATARI_TARGET_DIR)res/fonts/
+ $(Q)cp $(ATARI_FONT_DOC_DIR)README.TXT $(ATARI_TARGET_DIR)res/fonts/
+ $(Q)cp $(ATARI_FONT_DOC_DIR)COPYRIGHT-FAQ.TXT
$(ATARI_TARGET_DIR)res/fonts/
+
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)Vera.ttf
$(ATARI_TARGET_DIR)res/fonts/ss.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraBd.ttf
$(ATARI_TARGET_DIR)res/fonts/ssb.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraIt.ttf
$(ATARI_TARGET_DIR)res/fonts/ssi.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraBI.ttf
$(ATARI_TARGET_DIR)res/fonts/ssib.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraSe.ttf
$(ATARI_TARGET_DIR)res/fonts/s.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraSeBd.ttf
$(ATARI_TARGET_DIR)res/fonts/sb.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMono.ttf
$(ATARI_TARGET_DIR)res/fonts/mono.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMoBd.ttf
$(ATARI_TARGET_DIR)res/fonts/monob.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMoIt.ttf
$(ATARI_TARGET_DIR)res/fonts/cursive.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMoBI.ttf
$(ATARI_TARGET_DIR)res/fonts/fantasy.ttf
+
+ $(Q)cp $(EXETARGET) $(ATARI_TARGET_DIR)$(EXETARGET)
+
+# zip files
+ $(Q)zip $(PKGNAME) -9 -r ./$(ATARI_TARGET_DIR)
+
+# delete temporary folder
+ $(Q)rm -rf $(ATARI_TARGET_DIR)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/d97eb2f52054e8f77adb16d2a8afbf5fd0e576a1
commit d97eb2f52054e8f77adb16d2a8afbf5fd0e576a1
Author: Ole Loots <[email protected]>
Commit: Ole Loots <[email protected]>
Updated default options
diff --git a/atari/options.h b/atari/options.h
index 3ec2646..56be492 100755
--- a/atari/options.h
+++ b/atari/options.h
@@ -49,13 +49,13 @@
char *tree_icons_path
#define NSOPTION_EXTRA_DEFAULTS
\
- .atari_font_driver = (char*)"vdi", \
+ .atari_font_driver = (char*)"freetype", \
.atari_font_monochrom = 0,
\
.atari_dither = 1,
\
.atari_transparency = 1,
\
.atari_image_toolbar_folder = (char*)"default", \
- .atari_image_toolbar = 0,
\
- .atari_toolbar_bg = 0xFFFFFF, \
+ .atari_image_toolbar = 1,
\
+ .atari_toolbar_bg = 0xbbbbbb, \
.atari_face_sans_serif = NULL, \
.atari_face_sans_serif_bold = NULL, \
.atari_face_sans_serif_italic = NULL, \
-----------------------------------------------------------------------
Summary of changes:
atari/Makefile.target | 89 +++++++++++++++++++++++++++++++++++++++---------
atari/options.h | 6 ++--
2 files changed, 75 insertions(+), 20 deletions(-)
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 283d634..edc8ce3 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -86,15 +86,28 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
# Install target
# ----------------------------------------------------------------------------
-ATARI_INSTALL_TARGET_DIR := nsatari.package
-ATARI_RES_DIR := atari/res
+ATARI_TARGET_DIR := netsurf/
+ATARI_RES_DIR := atari/res/
+ATARI_DOC_DIR := atari/doc/
+ATARI_FONT_SOURCE_DIR := /usr/share/fonts/truetype/ttf-bitstream-vera/
+ATARI_FONT_DOC_DIR := /usr/share/doc/ttf-bitstream-vera/
+
+ifeq ($(HOST),mint)
+ STRIP := strip
+ STACK := stack
+endif
+
+ifneq ($(HOST),mint)
+ STRIP := m68k-atari-mint-strip
+ STACK := m68k-atari-mint-stack
+endif
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
-install-atari:
+install-atari:
# ----------------------------------------------------------------------------
# Package target
@@ -104,17 +117,59 @@ package-atari: $(PKGNAME)
$(VQ)echo Creating $(PKGNAME)
$(PKGNAME): $(EXETARGET)
- $(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR)
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res
- $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts
- #$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons
- $(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies
- $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc
$(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc
- $(Q)cp $(ATARI_RES_DIR)/icons/
$(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R
-
-
- $(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf
+ $(Q)$(STRIP) $(EXETARGET)
+ $(Q)$(STACK) -S 256k $(EXETARGET)
+ $(Q)rm -rf $(ATARI_TARGET_DIR)
+ $(Q)rm -rf $(PKGNAME)
+ $(Q)mkdir $(ATARI_TARGET_DIR)
+ $(Q)mkdir $(ATARI_TARGET_DIR)doc
+ $(Q)mkdir $(ATARI_TARGET_DIR)download
+ $(Q)mkdir $(ATARI_TARGET_DIR)res
+ $(Q)mkdir $(ATARI_TARGET_DIR)res/fonts
+ $(Q)mkdir $(ATARI_TARGET_DIR)res/icons
+ $(Q)touch $(ATARI_TARGET_DIR)cookies
+ $(Q)touch $(ATARI_TARGET_DIR)url.db
+
+ $(Q)cp $(ATARI_DOC_DIR)bugs $(ATARI_TARGET_DIR)doc/
+ $(Q)cp $(ATARI_DOC_DIR)faq.txt $(ATARI_TARGET_DIR)doc/
+ $(Q)cp $(ATARI_DOC_DIR)readme.txt $(ATARI_TARGET_DIR)doc/
+ $(Q)cp $(ATARI_DOC_DIR)todo.txt $(ATARI_TARGET_DIR)doc/
+
+# GUI resources:
+ $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_TARGET_DIR)res/netsurf.rsc
+ $(Q)cp $(ATARI_RES_DIR)/icons -R $(ATARI_TARGET_DIR)res/icons
+ $(Q)cp \!NetSurf/Resources/Icons/content.png -R
$(ATARI_TARGET_DIR)res/icons/
+ $(Q)cp \!NetSurf/Resources/Icons/directory.png -R
$(ATARI_TARGET_DIR)res/icons/dir.png
+
+ $(Q)cp \!NetSurf/Resources/AdBlock,f79
$(ATARI_TARGET_DIR)res/adblock.css
+ $(Q)cp \!NetSurf/Resources/CSS,f79 $(ATARI_TARGET_DIR)res/default.css
+ $(Q)cp \!NetSurf/Resources/Quirks,f79 $(ATARI_TARGET_DIR)res/quirks.css
+ $(Q)cp \!NetSurf/Resources/internal.css,f79
$(ATARI_TARGET_DIR)res/internal.css
+ $(Q)cp \!NetSurf/Resources/SearchEngines $(ATARI_TARGET_DIR)res/search
+ $(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
+ $(Q)cp resources/FatMessages $(ATARI_TARGET_DIR)res/messages
+ $(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
+
+# copy "Bitstream Vera" font:
+ $(Q)cp $(ATARI_FONT_DOC_DIR)copyright $(ATARI_TARGET_DIR)res/fonts/
+ $(Q)cp $(ATARI_FONT_DOC_DIR)README.TXT $(ATARI_TARGET_DIR)res/fonts/
+ $(Q)cp $(ATARI_FONT_DOC_DIR)COPYRIGHT-FAQ.TXT
$(ATARI_TARGET_DIR)res/fonts/
+
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)Vera.ttf
$(ATARI_TARGET_DIR)res/fonts/ss.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraBd.ttf
$(ATARI_TARGET_DIR)res/fonts/ssb.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraIt.ttf
$(ATARI_TARGET_DIR)res/fonts/ssi.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraBI.ttf
$(ATARI_TARGET_DIR)res/fonts/ssib.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraSe.ttf
$(ATARI_TARGET_DIR)res/fonts/s.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraSeBd.ttf
$(ATARI_TARGET_DIR)res/fonts/sb.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMono.ttf
$(ATARI_TARGET_DIR)res/fonts/mono.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMoBd.ttf
$(ATARI_TARGET_DIR)res/fonts/monob.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMoIt.ttf
$(ATARI_TARGET_DIR)res/fonts/cursive.ttf
+ $(Q)cp $(ATARI_FONT_SOURCE_DIR)VeraMoBI.ttf
$(ATARI_TARGET_DIR)res/fonts/fantasy.ttf
+
+ $(Q)cp $(EXETARGET) $(ATARI_TARGET_DIR)$(EXETARGET)
+
+# zip files
+ $(Q)zip $(PKGNAME) -9 -r ./$(ATARI_TARGET_DIR)
+
+# delete temporary folder
+ $(Q)rm -rf $(ATARI_TARGET_DIR)
diff --git a/atari/options.h b/atari/options.h
index 3ec2646..56be492 100755
--- a/atari/options.h
+++ b/atari/options.h
@@ -49,13 +49,13 @@
char *tree_icons_path
#define NSOPTION_EXTRA_DEFAULTS
\
- .atari_font_driver = (char*)"vdi", \
+ .atari_font_driver = (char*)"freetype", \
.atari_font_monochrom = 0,
\
.atari_dither = 1,
\
.atari_transparency = 1,
\
.atari_image_toolbar_folder = (char*)"default", \
- .atari_image_toolbar = 0,
\
- .atari_toolbar_bg = 0xFFFFFF, \
+ .atari_image_toolbar = 1,
\
+ .atari_toolbar_bg = 0xbbbbbb, \
.atari_face_sans_serif = NULL, \
.atari_face_sans_serif_bold = NULL, \
.atari_face_sans_serif_italic = NULL, \
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
