netsurf: branch mmu_man/docs_env_sh_tweaks updated. release/3.0-823-ga3b8451
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/a3b845170dce994edc8c1...
...commit http://git.netsurf-browser.org/netsurf.git/commit/a3b845170dce994edc8c1c8...
...tree http://git.netsurf-browser.org/netsurf.git/tree/a3b845170dce994edc8c1c819...
The branch, mmu_man/docs_env_sh_tweaks has been updated
via a3b845170dce994edc8c1c819692aaa783a5015f (commit)
via 674ef3f9f399e5b174c831326ca4bb6f36b40d01 (commit)
from d86034af065a7f8f0b6eee7035e8bcad6186fbd6 (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/commit/?id=a3b845170dce994edc8...
commit a3b845170dce994edc8c1c819692aaa783a5015f
Author: François Revol <revol(a)free.fr>
Commit: François Revol <revol(a)free.fr>
env.sh: Add ns-pkgman-install to install Haiku dev packages
diff --git a/Docs/env.sh b/Docs/env.sh
index 79b4188..2859e6d 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -56,6 +56,13 @@ NS_DEV_DEB="build-essential pkg-config git gperf"
NS_TOOL_DEB="flex bison"
NS_GTK_DEB="libgtk2.0-dev libcurl3-dev libmng-dev librsvg2-dev liblcms1-dev libjpeg-dev libmozjs-dev"
+# Haiku secondary arch suffix:
+# empty for primary (gcc2 on x86),
+# "_x86" for gcc4 secondary.
+HA=
+# Haiku packages
+NS_DEV_HPKG="curl${HA}_devel libpng${HA}_devel jpeg${HA}_devel openssl${HA}_devel libiconv${HA}_devel expat${HA}_devel pkgconfig${HA} html_parser"
+
#add target specific libraries
if [ "x${TARGET_ABI}" = "xriscos" ]; then
NS_FRONTEND_LIBS="${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS}"
@@ -67,6 +74,12 @@ ns-apt-get-install()
sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB})
}
+# pkgman commandline to install necessary dev packages
+ns-pkgman-install()
+{
+ pkgman install $(echo ${NS_DEV_HPKG})
+}
+
# git pull in all repos parameters are passed to git pull
ns-pull()
{
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=674ef3f9f399e5b174c...
commit 674ef3f9f399e5b174c831326ca4bb6f36b40d01
Author: François Revol <revol(a)free.fr>
Commit: François Revol <revol(a)free.fr>
env.sh: export LIBRARY_PATH for Haiku
Maybe those should be conditional on $TARGET_ABI...
diff --git a/Docs/env.sh b/Docs/env.sh
index a214672..79b4188 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -36,6 +36,7 @@ echo "USE_CPUS=${USE_CPUS}"
export PREFIX=${TARGET_WORKSPACE}/inst-${TARGET_ABI}
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}::
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
+export LIBRARY_PATH=${LIBRARY_PATH}:${PREFIX}/lib
export PATH=${PATH}:${PREFIX}/bin
NS_GIT="git://git.netsurf-browser.org"
-----------------------------------------------------------------------
Summary of changes:
Docs/env.sh | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/Docs/env.sh b/Docs/env.sh
index a214672..2859e6d 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -36,6 +36,7 @@ echo "USE_CPUS=${USE_CPUS}"
export PREFIX=${TARGET_WORKSPACE}/inst-${TARGET_ABI}
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}::
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
+export LIBRARY_PATH=${LIBRARY_PATH}:${PREFIX}/lib
export PATH=${PATH}:${PREFIX}/bin
NS_GIT="git://git.netsurf-browser.org"
@@ -55,6 +56,13 @@ NS_DEV_DEB="build-essential pkg-config git gperf"
NS_TOOL_DEB="flex bison"
NS_GTK_DEB="libgtk2.0-dev libcurl3-dev libmng-dev librsvg2-dev liblcms1-dev libjpeg-dev libmozjs-dev"
+# Haiku secondary arch suffix:
+# empty for primary (gcc2 on x86),
+# "_x86" for gcc4 secondary.
+HA=
+# Haiku packages
+NS_DEV_HPKG="curl${HA}_devel libpng${HA}_devel jpeg${HA}_devel openssl${HA}_devel libiconv${HA}_devel expat${HA}_devel pkgconfig${HA} html_parser"
+
#add target specific libraries
if [ "x${TARGET_ABI}" = "xriscos" ]; then
NS_FRONTEND_LIBS="${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS}"
@@ -66,6 +74,12 @@ ns-apt-get-install()
sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB})
}
+# pkgman commandline to install necessary dev packages
+ns-pkgman-install()
+{
+ pkgman install $(echo ${NS_DEV_HPKG})
+}
+
# git pull in all repos parameters are passed to git pull
ns-pull()
{
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch mmu_man/docs_env_sh_tweaks created. release/3.0-821-gd86034a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d86034af065a7f8f0b6ee...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d86034af065a7f8f0b6eee7...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d86034af065a7f8f0b6eee703...
The branch, mmu_man/docs_env_sh_tweaks has been created
at d86034af065a7f8f0b6eee7035e8bcad6186fbd6 (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d86034af065a7f8f0b6...
commit d86034af065a7f8f0b6eee7035e8bcad6186fbd6
Author: François Revol <revol(a)free.fr>
Commit: François Revol <revol(a)free.fr>
env.sh: Account for BSD variant getconf NPROCESSORS_ONLN
Haiku now provides the BSD getconf, so should work as well.
One might want to handle Solaris too some day...
cf. https://gist.github.com/jj1bdx/5746298
diff --git a/Docs/env.sh b/Docs/env.sh
index 7dc9fca..a214672 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -22,7 +22,7 @@ if [ "x${TARGET_WORKSPACE}" = "x" ]; then
fi
if [ "x${USE_CPUS}" = "x" ]; then
- NCPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
+ NCPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null)
NCPUS="${NCPUS:-1}"
NCPUS=$((NCPUS * 2))
USE_CPUS="-j${NCPUS}"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1ecdc551518e4373cfd...
commit 1ecdc551518e4373cfd76181b17f2ead4d9ebd30
Author: François Revol <revol(a)free.fr>
Commit: François Revol <revol(a)free.fr>
env.sh: Use a more portable way of counting online processors
getconf _NPROCESSORS_ONLN should be available on Linux, FreeBSD
and OSX at least:
http://linux.die.net/man/1/getconf
https://developer.apple.com/library/mac/documentation/Darwin/Reference/Ma...
...and shall soon be available on Haiku as well.
diff --git a/Docs/env.sh b/Docs/env.sh
index db2729c..7dc9fca 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -22,7 +22,7 @@ if [ "x${TARGET_WORKSPACE}" = "x" ]; then
fi
if [ "x${USE_CPUS}" = "x" ]; then
- NCPUS=$(grep -c "^processor" /proc/cpuinfo 2>/dev/null)
+ NCPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
NCPUS="${NCPUS:-1}"
NCPUS=$((NCPUS * 2))
USE_CPUS="-j${NCPUS}"
-----------------------------------------------------------------------
--
NetSurf Browser
9 years, 1 month
- 1
- 0
libdom: branch master updated. release/0.0.1-13-g44d4e32
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libdom.git/shortlog/44d4e3255c5a2e6c6517c0...
...commit http://git.netsurf-browser.org/libdom.git/commit/44d4e3255c5a2e6c6517c06e...
...tree http://git.netsurf-browser.org/libdom.git/tree/44d4e3255c5a2e6c6517c06e8e...
The branch, master has been updated
via 44d4e3255c5a2e6c6517c06e8eb3e88eaa20d657 (commit)
from 45b5b023f34da5398b26968af851acb0ee4c5b2b (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/libdom.git/commit/?id=44d4e3255c5a2e6c6517...
commit 44d4e3255c5a2e6c6517c06e8eb3e88eaa20d657
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Prevent attempt to concatinate string with null.
diff --git a/src/core/text.c b/src/core/text.c
index e36050e..3b726fd 100644
--- a/src/core/text.c
+++ b/src/core/text.c
@@ -491,14 +491,18 @@ dom_exception walk_logic_adjacent_text(dom_text *text,
return err;
}
- err = dom_string_concat(*ret, data, &tmp);
- dom_string_unref(data);
- dom_string_unref(*ret);
- if (err != DOM_NO_ERR) {
- return err;
- }
+ if (*ret != NULL) {
+ err = dom_string_concat(*ret, data, &tmp);
+ dom_string_unref(data);
+ dom_string_unref(*ret);
+ if (err != DOM_NO_ERR) {
+ return err;
+ }
- *ret = tmp;
+ *ret = tmp;
+ } else {
+ *ret = data;
+ }
} else {
dom_node_internal *tn;
err = dom_node_remove_child(node->parent, node,
-----------------------------------------------------------------------
Summary of changes:
src/core/text.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/core/text.c b/src/core/text.c
index e36050e..3b726fd 100644
--- a/src/core/text.c
+++ b/src/core/text.c
@@ -491,14 +491,18 @@ dom_exception walk_logic_adjacent_text(dom_text *text,
return err;
}
- err = dom_string_concat(*ret, data, &tmp);
- dom_string_unref(data);
- dom_string_unref(*ret);
- if (err != DOM_NO_ERR) {
- return err;
- }
+ if (*ret != NULL) {
+ err = dom_string_concat(*ret, data, &tmp);
+ dom_string_unref(data);
+ dom_string_unref(*ret);
+ if (err != DOM_NO_ERR) {
+ return err;
+ }
- *ret = tmp;
+ *ret = tmp;
+ } else {
+ *ret = data;
+ }
} else {
dom_node_internal *tn;
err = dom_node_remove_child(node->parent, node,
--
Document Object Model library
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-819-g289cd3a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/289cd3a7975125d133f42...
...commit http://git.netsurf-browser.org/netsurf.git/commit/289cd3a7975125d133f42ce...
...tree http://git.netsurf-browser.org/netsurf.git/tree/289cd3a7975125d133f42ceb3...
The branch, master has been updated
via 289cd3a7975125d133f42ceb314db1332ff13032 (commit)
from feef0562b50162987ddf8e2ec3aa2d877e7657fe (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/commit/?id=289cd3a7975125d133f...
commit 289cd3a7975125d133f42ceb314db1332ff13032
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added scale property to gui_window and use it.
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 45b9d15..82de7d6 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -379,35 +379,19 @@ static void __CDECL menu_reload(short item, short title, void *data)
static void __CDECL menu_inc_scale(short item, short title, void *data)
{
- int width = 0, heigth = 0;
-
if(input_window == NULL)
return;
- float now = plot_get_scale();
- plot_set_scale(now+0.25);
- LOG(("%s, scale: %f", __FUNCTION__, plot_get_scale()));
- browser_window_reload(input_window->browser->bw, false);
- gui_window_get_dimensions(input_window, &width, &heigth, true);
- browser_window_reformat(input_window->browser->bw, false, width, heigth);
+ gui_window_set_scale(input_window, gui_window_get_scale(input_window)+0.25);
}
static void __CDECL menu_dec_scale(short item, short title, void *data)
{
- int width = 0, heigth = 0;
-
if(input_window == NULL)
- return;
- float now = plot_get_scale();
- if (now > 0.5) {
- plot_set_scale(now-0.25);
- }
- LOG(("%s, scale: %f", __FUNCTION__, plot_get_scale()));
-
- browser_window_reload(input_window->browser->bw, false);
- gui_window_get_dimensions(input_window, &width, &heigth, true);
- browser_window_reformat(input_window->browser->bw, false, width, heigth);
+ return;
+
+ gui_window_set_scale(input_window, gui_window_get_scale(input_window)-0.25);
}
diff --git a/atari/gui.c b/atari/gui.c
index 42f6844..ace0f98 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -207,6 +207,7 @@ gui_create_browser_window(struct browser_window *bw,
option_window_x, option_window_y,
option_window_width, option_window_height
};
+ gui_window_set_scale(gw, 1.0);
gui_window_set_url(gw, "");
gui_window_set_pointer(gw, BROWSER_POINTER_DEFAULT);
gui_set_input_gui_window(gw);
@@ -345,6 +346,24 @@ void gui_window_set_status(struct gui_window *w, const char *text)
window_set_stauts(w->root, (char*)text);
}
+float gui_window_get_scale(struct gui_window *gw)
+{
+ return(gw->scale);
+}
+
+void gui_window_set_scale(struct gui_window *gw, float scale)
+{
+ int width = 0, heigth = 0;
+
+ LOG(("scale: %f", scale));
+
+ gw->scale = MAX(scale, 0.25);
+
+ browser_window_reload(gw->browser->bw, false);
+ gui_window_get_dimensions(gw, &width, &heigth, true);
+ browser_window_reformat(gw->browser->bw, false, width, heigth);
+}
+
void gui_window_redraw_window(struct gui_window *gw)
{
CMP_BROWSER b;
diff --git a/atari/gui.h b/atari/gui.h
index a1135e2..a1519f3 100755
--- a/atari/gui.h
+++ b/atari/gui.h
@@ -149,6 +149,7 @@ struct gui_window {
char * title;
char * url;
struct bitmap * icon;
+ float scale;
struct s_caret caret;
struct s_search_form_session *search;
struct gui_window *next, *prev;
diff --git a/atari/rootwin.c b/atari/rootwin.c
index fddd7d0..4b8c3bc 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -835,13 +835,14 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area,
struct rect redraw_area;
GRECT content_area_rel;
+ float oldscale = 1.0;
//dbg_grect("browser redraw, content area", content_area);
//dbg_grect("browser redraw, content clip", clip);
plot_set_dimensions(content_area->g_x, content_area->g_y,
content_area->g_w, content_area->g_h);
-
+ oldscale = plot_set_scale(gui_window_get_scale(rootwin->active_gui_window));
/* first, we make the coords relative to the content area: */
content_area_rel.g_x = clip->g_x - content_area->g_x;
@@ -872,6 +873,8 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area,
browser_window_redraw( bw, -(slid->x_pos*slid->x_unit_px),
-(slid->y_pos*slid->y_unit_px), &redraw_area, &rootwin_rdrw_ctx);
+
+ plot_set_scale(oldscale);
}
@@ -1398,6 +1401,7 @@ static void on_redraw(ROOTWIN *rootwin, short msg[8])
//dbg_grect("on_redraw", &clip);
if(gemtk_wm_get_state(rootwin->win) & GEMTK_WM_STATUS_ICONIFIED) {
+ // TODO: remove asignment:
GRECT clip = {msg[4], msg[5], msg[6], msg[7]};
window_redraw_favicon(rootwin, NULL);
} else {
-----------------------------------------------------------------------
Summary of changes:
atari/deskmenu.c | 24 ++++--------------------
atari/gui.c | 19 +++++++++++++++++++
atari/gui.h | 1 +
atari/rootwin.c | 6 +++++-
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 45b9d15..82de7d6 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -379,35 +379,19 @@ static void __CDECL menu_reload(short item, short title, void *data)
static void __CDECL menu_inc_scale(short item, short title, void *data)
{
- int width = 0, heigth = 0;
-
if(input_window == NULL)
return;
- float now = plot_get_scale();
- plot_set_scale(now+0.25);
- LOG(("%s, scale: %f", __FUNCTION__, plot_get_scale()));
- browser_window_reload(input_window->browser->bw, false);
- gui_window_get_dimensions(input_window, &width, &heigth, true);
- browser_window_reformat(input_window->browser->bw, false, width, heigth);
+ gui_window_set_scale(input_window, gui_window_get_scale(input_window)+0.25);
}
static void __CDECL menu_dec_scale(short item, short title, void *data)
{
- int width = 0, heigth = 0;
-
if(input_window == NULL)
- return;
- float now = plot_get_scale();
- if (now > 0.5) {
- plot_set_scale(now-0.25);
- }
- LOG(("%s, scale: %f", __FUNCTION__, plot_get_scale()));
-
- browser_window_reload(input_window->browser->bw, false);
- gui_window_get_dimensions(input_window, &width, &heigth, true);
- browser_window_reformat(input_window->browser->bw, false, width, heigth);
+ return;
+
+ gui_window_set_scale(input_window, gui_window_get_scale(input_window)-0.25);
}
diff --git a/atari/gui.c b/atari/gui.c
index 42f6844..ace0f98 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -207,6 +207,7 @@ gui_create_browser_window(struct browser_window *bw,
option_window_x, option_window_y,
option_window_width, option_window_height
};
+ gui_window_set_scale(gw, 1.0);
gui_window_set_url(gw, "");
gui_window_set_pointer(gw, BROWSER_POINTER_DEFAULT);
gui_set_input_gui_window(gw);
@@ -345,6 +346,24 @@ void gui_window_set_status(struct gui_window *w, const char *text)
window_set_stauts(w->root, (char*)text);
}
+float gui_window_get_scale(struct gui_window *gw)
+{
+ return(gw->scale);
+}
+
+void gui_window_set_scale(struct gui_window *gw, float scale)
+{
+ int width = 0, heigth = 0;
+
+ LOG(("scale: %f", scale));
+
+ gw->scale = MAX(scale, 0.25);
+
+ browser_window_reload(gw->browser->bw, false);
+ gui_window_get_dimensions(gw, &width, &heigth, true);
+ browser_window_reformat(gw->browser->bw, false, width, heigth);
+}
+
void gui_window_redraw_window(struct gui_window *gw)
{
CMP_BROWSER b;
diff --git a/atari/gui.h b/atari/gui.h
index a1135e2..a1519f3 100755
--- a/atari/gui.h
+++ b/atari/gui.h
@@ -149,6 +149,7 @@ struct gui_window {
char * title;
char * url;
struct bitmap * icon;
+ float scale;
struct s_caret caret;
struct s_search_form_session *search;
struct gui_window *next, *prev;
diff --git a/atari/rootwin.c b/atari/rootwin.c
index fddd7d0..4b8c3bc 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -835,13 +835,14 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area,
struct rect redraw_area;
GRECT content_area_rel;
+ float oldscale = 1.0;
//dbg_grect("browser redraw, content area", content_area);
//dbg_grect("browser redraw, content clip", clip);
plot_set_dimensions(content_area->g_x, content_area->g_y,
content_area->g_w, content_area->g_h);
-
+ oldscale = plot_set_scale(gui_window_get_scale(rootwin->active_gui_window));
/* first, we make the coords relative to the content area: */
content_area_rel.g_x = clip->g_x - content_area->g_x;
@@ -872,6 +873,8 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area,
browser_window_redraw( bw, -(slid->x_pos*slid->x_unit_px),
-(slid->y_pos*slid->y_unit_px), &redraw_area, &rootwin_rdrw_ctx);
+
+ plot_set_scale(oldscale);
}
@@ -1398,6 +1401,7 @@ static void on_redraw(ROOTWIN *rootwin, short msg[8])
//dbg_grect("on_redraw", &clip);
if(gemtk_wm_get_state(rootwin->win) & GEMTK_WM_STATUS_ICONIFIED) {
+ // TODO: remove asignment:
GRECT clip = {msg[4], msg[5], msg[6], msg[7]};
window_redraw_favicon(rootwin, NULL);
} else {
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-818-gfeef056
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/feef0562b50162987ddf8...
...commit http://git.netsurf-browser.org/netsurf.git/commit/feef0562b50162987ddf8e2...
...tree http://git.netsurf-browser.org/netsurf.git/tree/feef0562b50162987ddf8e2ec...
The branch, master has been updated
via feef0562b50162987ddf8e2ec3aa2d877e7657fe (commit)
from d003fcf8bc62b38480e8d89f715d0400ca4edd07 (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/commit/?id=feef0562b50162987dd...
commit feef0562b50162987ddf8e2ec3aa2d877e7657fe
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Implemented specific redraw when treeview is iconified.
diff --git a/atari/treeview.c b/atari/treeview.c
index fe92a02..8ac099c 100644
--- a/atari/treeview.c
+++ b/atari/treeview.c
@@ -38,6 +38,7 @@
#include "atari/misc.h"
#include "atari/gemtk/gemtk.h"
#include "atari/treeview.h"
+#include "atari/res/netsurf.rsh"
/**
@@ -154,6 +155,40 @@ static void atari_treeview_dump_info(struct atari_treeview_window *tv,
printf("Extent: x: %d, y: %d\n", tv->extent, tv->extent);
}
+static bool atari_treeview_is_iconified(struct core_window *cw){
+
+ struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
+
+ return((gemtk_wm_get_state(tv->window)&GEMTK_WM_STATUS_ICONIFIED) != 0);
+}
+
+static void atari_treeview_redraw_icon(struct core_window *cw, GRECT *clip)
+{
+ struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
+ GRECT visible, work;
+ OBJECT * tree = gemtk_obj_get_tree(ICONIFY);
+ short aesh = gemtk_wm_get_handle(tv->window);
+
+ gemtk_wm_get_grect(tv->window, GEMTK_WM_AREA_WORK, &work);
+
+ tree->ob_x = work.g_x;
+ tree->ob_y = work.g_y;
+ tree->ob_width = work.g_w;
+ tree->ob_height = work.g_h;
+
+ wind_get_grect(aesh, WF_FIRSTXYWH, &visible);
+ while (visible.g_h > 0 && visible.g_w > 0) {
+
+ if (rc_intersect(&work, &visible)) {
+ objc_draw(tree, 0, 8, visible.g_x, visible.g_y, visible.g_w,
+ visible.g_h);
+ } else {
+ //dbg_grect("redraw vis area outside", &visible);
+ }
+
+ wind_get_grect(aesh, WF_NEXTXYWH, &visible);
+ }
+}
void atari_treeview_redraw(struct core_window *cw)
{
@@ -236,7 +271,7 @@ void atari_treeview_redraw(struct core_window *cw)
clip.x1 = clip.x0 + todo[2]+(slid->x_pos*slid->x_unit_px);
clip.y1 = clip.y0 + todo[3]+(slid->y_pos*slid->y_unit_px);
- tv->io->draw(cw, -(slid->x_pos*slid->x_unit_px),
+ tv->io->draw(cw, -(slid->x_pos*slid->x_unit_px),
-(slid->y_pos*slid->y_unit_px),
&clip, &ctx);
}
@@ -488,6 +523,11 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
return;
}
+ if (atari_treeview_is_iconified(cw) == true) {
+ atari_treeview_redraw_icon(cw, &clip);
+ return;
+ }
+
/* make redraw coords relative to content viewport */
clip.g_x -= work.g_x;
clip.g_y -= work.g_y;
@@ -874,7 +914,14 @@ void atari_treeview_flush_redraws(void)
while(tmp){
assert(tmp->is_open);
if(tmp->redraw){
- atari_treeview_redraw((struct core_window *)tmp);
+ if (atari_treeview_is_iconified((struct core_window *)tmp)) {
+ /* No content redraw for iconified windows */
+ /* because otherwise the icon draw function would */
+ /* have to deal with plot canvas coords */
+ continue;
+ }
+
+ atari_treeview_redraw((struct core_window *)tmp);
}
tmp = tmp->next_open;
}
-----------------------------------------------------------------------
Summary of changes:
atari/treeview.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/atari/treeview.c b/atari/treeview.c
index fe92a02..8ac099c 100644
--- a/atari/treeview.c
+++ b/atari/treeview.c
@@ -38,6 +38,7 @@
#include "atari/misc.h"
#include "atari/gemtk/gemtk.h"
#include "atari/treeview.h"
+#include "atari/res/netsurf.rsh"
/**
@@ -154,6 +155,40 @@ static void atari_treeview_dump_info(struct atari_treeview_window *tv,
printf("Extent: x: %d, y: %d\n", tv->extent, tv->extent);
}
+static bool atari_treeview_is_iconified(struct core_window *cw){
+
+ struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
+
+ return((gemtk_wm_get_state(tv->window)&GEMTK_WM_STATUS_ICONIFIED) != 0);
+}
+
+static void atari_treeview_redraw_icon(struct core_window *cw, GRECT *clip)
+{
+ struct atari_treeview_window *tv = (struct atari_treeview_window *)cw;
+ GRECT visible, work;
+ OBJECT * tree = gemtk_obj_get_tree(ICONIFY);
+ short aesh = gemtk_wm_get_handle(tv->window);
+
+ gemtk_wm_get_grect(tv->window, GEMTK_WM_AREA_WORK, &work);
+
+ tree->ob_x = work.g_x;
+ tree->ob_y = work.g_y;
+ tree->ob_width = work.g_w;
+ tree->ob_height = work.g_h;
+
+ wind_get_grect(aesh, WF_FIRSTXYWH, &visible);
+ while (visible.g_h > 0 && visible.g_w > 0) {
+
+ if (rc_intersect(&work, &visible)) {
+ objc_draw(tree, 0, 8, visible.g_x, visible.g_y, visible.g_w,
+ visible.g_h);
+ } else {
+ //dbg_grect("redraw vis area outside", &visible);
+ }
+
+ wind_get_grect(aesh, WF_NEXTXYWH, &visible);
+ }
+}
void atari_treeview_redraw(struct core_window *cw)
{
@@ -236,7 +271,7 @@ void atari_treeview_redraw(struct core_window *cw)
clip.x1 = clip.x0 + todo[2]+(slid->x_pos*slid->x_unit_px);
clip.y1 = clip.y0 + todo[3]+(slid->y_pos*slid->y_unit_px);
- tv->io->draw(cw, -(slid->x_pos*slid->x_unit_px),
+ tv->io->draw(cw, -(slid->x_pos*slid->x_unit_px),
-(slid->y_pos*slid->y_unit_px),
&clip, &ctx);
}
@@ -488,6 +523,11 @@ static void __CDECL on_redraw_event(struct core_window *cw, EVMULT_OUT *ev_out,
return;
}
+ if (atari_treeview_is_iconified(cw) == true) {
+ atari_treeview_redraw_icon(cw, &clip);
+ return;
+ }
+
/* make redraw coords relative to content viewport */
clip.g_x -= work.g_x;
clip.g_y -= work.g_y;
@@ -874,7 +914,14 @@ void atari_treeview_flush_redraws(void)
while(tmp){
assert(tmp->is_open);
if(tmp->redraw){
- atari_treeview_redraw((struct core_window *)tmp);
+ if (atari_treeview_is_iconified((struct core_window *)tmp)) {
+ /* No content redraw for iconified windows */
+ /* because otherwise the icon draw function would */
+ /* have to deal with plot canvas coords */
+ continue;
+ }
+
+ atari_treeview_redraw((struct core_window *)tmp);
}
tmp = tmp->next_open;
}
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-817-gd003fcf
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d003fcf8bc62b38480e8d...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d003fcf8bc62b38480e8d89...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d003fcf8bc62b38480e8d89f7...
The branch, master has been updated
via d003fcf8bc62b38480e8d89f715d0400ca4edd07 (commit)
from fca1e67c522baaf329365c376d6e9944c70b3e0b (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/commit/?id=d003fcf8bc62b38480e...
commit d003fcf8bc62b38480e8d89f715d0400ca4edd07
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Do not redraw toolbar when window is iconified
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index a4565d7..920f53e 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -303,7 +303,9 @@ static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
g.g_y = msg[5];
g.g_w = msg[6];
g.g_h = msg[7];
- gemtk_wm_toolbar_redraw(gw, WM_REDRAW, &g);
+ if((gw->state & GEMTK_WM_STATUS_ICONIFIED) == 0){
+ gemtk_wm_toolbar_redraw(gw, WM_REDRAW, &g);
+ }
}
if (gw->form != NULL) {
g.g_x = msg[4];
-----------------------------------------------------------------------
Summary of changes:
atari/gemtk/guiwin.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index a4565d7..920f53e 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -303,7 +303,9 @@ static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8])
g.g_y = msg[5];
g.g_w = msg[6];
g.g_h = msg[7];
- gemtk_wm_toolbar_redraw(gw, WM_REDRAW, &g);
+ if((gw->state & GEMTK_WM_STATUS_ICONIFIED) == 0){
+ gemtk_wm_toolbar_redraw(gw, WM_REDRAW, &g);
+ }
}
if (gw->form != NULL) {
g.g_x = msg[4];
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-816-gfca1e67
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/fca1e67c522baaf329365...
...commit http://git.netsurf-browser.org/netsurf.git/commit/fca1e67c522baaf329365c3...
...tree http://git.netsurf-browser.org/netsurf.git/tree/fca1e67c522baaf329365c376...
The branch, master has been updated
via fca1e67c522baaf329365c376d6e9944c70b3e0b (commit)
from 064c471239edbe531e9eeb4aaf59d2b77ff9f4d8 (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/commit/?id=fca1e67c522baaf3293...
commit fca1e67c522baaf329365c376d6e9944c70b3e0b
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Minor change in changes.txt
diff --git a/atari/doc/changes.txt b/atari/doc/changes.txt
index f913bda..969a44b 100755
--- a/atari/doc/changes.txt
+++ b/atari/doc/changes.txt
@@ -15,13 +15,13 @@ NetSurf 2.9-PL1 Release (Sunday, April 15 2012) to Netsurf 3.1 Release.
- Removed WinDom dependency (heavy GUI code change)
- Implemented "paste clipboard" for toolbar URL textbox.
- - Implemented global history window.
- Implemented file drop on browser window handling when netsurf core
ignores the file drop event.
- Implemented basic browser window scaling
- Integrated "search page" dialog into browser window
- New settings dialog
- New treeview implementation
+ - Added global history window.
- Added SSL information treeview
- Added about dialog
- Improved keyboard-shortcut handling
-----------------------------------------------------------------------
Summary of changes:
atari/doc/changes.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/atari/doc/changes.txt b/atari/doc/changes.txt
index f913bda..969a44b 100755
--- a/atari/doc/changes.txt
+++ b/atari/doc/changes.txt
@@ -15,13 +15,13 @@ NetSurf 2.9-PL1 Release (Sunday, April 15 2012) to Netsurf 3.1 Release.
- Removed WinDom dependency (heavy GUI code change)
- Implemented "paste clipboard" for toolbar URL textbox.
- - Implemented global history window.
- Implemented file drop on browser window handling when netsurf core
ignores the file drop event.
- Implemented basic browser window scaling
- Integrated "search page" dialog into browser window
- New settings dialog
- New treeview implementation
+ - Added global history window.
- Added SSL information treeview
- Added about dialog
- Improved keyboard-shortcut handling
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-815-g064c471
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/064c471239edbe531e9ee...
...commit http://git.netsurf-browser.org/netsurf.git/commit/064c471239edbe531e9eeb4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/064c471239edbe531e9eeb4aa...
The branch, master has been updated
via 064c471239edbe531e9eeb4aaf59d2b77ff9f4d8 (commit)
from d788a1efc62566c0ba24b6ac5e967147a4d0d8b4 (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/commit/?id=064c471239edbe531e9...
commit 064c471239edbe531e9eeb4aaf59d2b77ff9f4d8
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Assign 0 not NULL as window handle when sending application message
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index 078fb36..a4565d7 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -1219,7 +1219,7 @@ void gemtk_wm_send_msg(GUIWIN *win, short msg_type, short a, short b, short c,
msg[0] = msg_type;
msg[1] = gl_apid;
msg[2] = 0;
- msg[3] = (win != NULL) ? win->handle : NULL;
+ msg[3] = (win != NULL) ? win->handle : 0;
msg[4] = a;
msg[5] = b;
msg[6] = c;
-----------------------------------------------------------------------
Summary of changes:
atari/gemtk/guiwin.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index 078fb36..a4565d7 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -1219,7 +1219,7 @@ void gemtk_wm_send_msg(GUIWIN *win, short msg_type, short a, short b, short c,
msg[0] = msg_type;
msg[1] = gl_apid;
msg[2] = 0;
- msg[3] = (win != NULL) ? win->handle : NULL;
+ msg[3] = (win != NULL) ? win->handle : 0;
msg[4] = a;
msg[5] = b;
msg[6] = c;
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-814-gd788a1e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d788a1efc62566c0ba24b...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d788a1efc62566c0ba24b6a...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d788a1efc62566c0ba24b6ac5...
The branch, master has been updated
via d788a1efc62566c0ba24b6ac5e967147a4d0d8b4 (commit)
via 5e261a363de737d4f937fd920725271b58ba9fd7 (commit)
from 81f7cf5a75908b25d46e7b07fb989ba00c6e9a43 (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/commit/?id=d788a1efc62566c0ba2...
commit d788a1efc62566c0ba24b6ac5e967147a4d0d8b4
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Removed obsolete build helper scripts
diff --git a/atari/scripts/make.sh b/atari/scripts/make.sh
deleted file mode 100755
index bea956e..0000000
--- a/atari/scripts/make.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-arch="68000"
-#arch="68020-60"
-#arch="5475"
-prefix="/usr/m68k-atari-mint/"
-libdir=$prefix"lib/"
-outfile="ns.prg"
-release="0"
-
-while [ "$1" != "" ] # When there are arguments...
-do # Process the next one
- case $1 # Look at $1
- in
- -arch)
- shift
- arch=$1
- shift
- ;;
-
- -prefix)
- shift
- prefix=$1
- shift
- ;;
-
- -release)
- release="1"
- shift
- ;;
-
- *)
- echo "Unknown commandline option"
- exit;;
- esac
-done
-
-libdir=$prefix"lib/"
-
-
-if [ "$arch" = "68000" ]
-then
-echo "Default m68000 build."
-else
-libdir="$libdir/m$arch/"
-fi
-
-if [ "$arch" = "68020-60" ]
-then
-outfile="ns020.prg"
-fi
-
-if [ "$arch" = "5475" ]
-then
-outfile="nscf.prg"
-fi
-
-
-echo "compiling: " $outfile
-echo
-
-
-
-pkgconfdir="$libdir"pkgconfig
-export PKG_CONFIG_PATH=$pkgconfdir
-export PKG_CONFIG_LIBDIR=$pkgconfdir
-
-#env
-
-echo "ibdir: $libdir"
-echo "pkgconfdir: $pkgconfdir"
-echo "arch: $arch"
-
-
-echo PKG_CONFIG_PATH="$pkgconfdir" PKG_CONFIG_LIBDIR="$pkgconfdir" AS="m68k-atari-mint-as" CC="m68k-atari-mint-gcc" LD="m68k-atari-mint-ld" AR="m68k-atari-mint-ar" RANLIB="m68k-atari-mint-ranlib" make TARGET="atari"
-PKG_CONFIG_PATH="$pkgconfdir" PKG_CONFIG_LIBDIR="$pkgconfdir" AS="m68k-atari-mint-as" CC="m68k-atari-mint-gcc" LD="m68k-atari-mint-ld" AR="m68k-atari-mint-ar" RANLIB="m68k-atari-mint-ranlib" make TARGET="atari"
-if [ "$arch" != "68000" ]
-then
-mv ns.prg $outfile
-fi
-
-
-if [ "$release" = "1" ]
-then
-echo Stripping $outfile ...
-m68k-atari-mint-strip $outfile
-fi
-
-
diff --git a/atari/scripts/makelibs.sh b/atari/scripts/makelibs.sh
deleted file mode 100755
index 80c3161..0000000
--- a/atari/scripts/makelibs.sh
+++ /dev/null
@@ -1,591 +0,0 @@
-#!/bin/sh
-
-#todo: cflib, libcurl -> ensure ssl support, force ssl support
-
-#example usage:
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68000 -cross -nsonly -clean -src ./
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68020 -cross -arch 68020 -nsonly -clean -src ./
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68020-60 -cross -arch 68020-60 -nsonly -clean -src ./
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m5475 -cross -arch 5475 -clean
-
-# option description:
-#
-#-buildroot - this option tells the script where it is located, only needen when the script isn|t located in cwd.
-#-arch - specifiy architecture type (format: 68000, 68020, 5475 etc...)
-#-src - tell the tool where the sources for the ns libs are located
-#-prefix - what prefix to use ( -prefix local )
-#-dest - where to install result files, this should NOT point to /usr or something like that!!! Its a temporary folder.
-#-optflags
-#-with-nsfb - compile with libnsfb
-#-cross - set up some cross-compiler vars
-#-clean - clean source dirs before building
-#-nsonly - only build netsurf libs
-#-dry - only set environment variables, echo them and then exit the script
-#-release - compile from release svn tree
-
-buildroot=`pwd`"/"
-libopensslpkg="openssl-0.9.8r"
-libpngpkg="libpng-1.5.10"
-libzlibpkg="zlib-1.2.5"
-libldgpkg="ldg-dev-2.33"
-libiconvpkg="libiconv-1.13.1"
-libcurlpkg="curl-7.25.0"
-libfreetypepkg="freetype-2.4.9"
-libhermespkg="Hermes-1.3.3"
-libjpegpkg="jpeg-8b"
-libparserutils_version=0.1.1
-libwapcaplet_version=0.1.1
-hubbub_version=0.1.2
-libnsgif_version=0.0.3
-libnsbmp_version=0.0.3
-libnsfb_version=0.0.2
-libcss_version=0.1.2
-arch="68000"
-archdir=""
-debugmode="1"
-profileflags=""
-optflags="-O2"
-withnsfb="1"
-prefix="/usr"
-userfs=$buildroot"userfs"
-patchdir=$buildroot"patches/"
-builddir=$buildroot"build/"
-rpmdir=$buildroot"packages/"
-nssrctree=$buildroot
-compiler="gcc"
-cross="0"
-cleanup="echo no cleaning"
-ssltarget="m68k-mint"
-dry="0"
-nsonly="0"
-release="0"
-
-if [ "$CC" != "" ]
-then
- compiler=$CC
-fi
-
-while [ "$1" != "" ] # When there are arguments...
-do # Process the next one
- case $1 # Look at $1
- in
- -dummy)
- dummy="1"
- shift
- ;;
-
- -p)
- profileflags="-pg"
- shift
- ;;
-
- -buildroot)
- shift
- buildroot=$1
- userfs=$buildroot"userfs"
- patchdir=$buildroot"patches/"
- builddir=$buildroot"build/"
- rpmdir=$buildroot"packages/"
- nssrctree=$buildroot"src/"
- shift
- ;;
-
- -arch)
- shift
- arch=$1
- shift
- ;;
-
- -src)
- shift
- nssrctree=$1
- shift
- ;;
-
- -prefix)
- shift
- prefix=$1
- shift
- ;;
-
- -release)
- release="1"
- shift
- ;;
-
- -dest)
- shift
- userfs=$1
- shift
- ;;
-
- -optflags)
- shift
- optflags=$1
- shift
- ;;
-
- -with-nsfb)
- withnsfb="1"
- shift
- ;;
-
- -cross )
- cross="1"
- shift
- ;;
-
- -nsonly )
- nsonly="1"
- shift
- ;;
-
- -clean )
- cleanup="make clean && make distclean"
- shift
- ;;
-
- -dry )
- dry="1"
- shift
- ;;
-
- *) echo "Option [$1] not one of [-buildroot,-arch,-src,-prefix,-dest,-optflags,-with-nsfb]";
- exit;;
- esac
-done
-
-
-if [ -d "$buildroot" ]
-then
- echo "Buildroot: $buildroot"
-else
- echo "Invalid buildroot directory ("$buildroot") !"
- echo "This script must know where it is located!"
- echo "Either use buildroot option or start from directory where the script is located."
- exit 0
-fi
-
-if [ "$release" = "0" ]
-then
-libparserutils_version=""
-libwapcaplet_version=""
-hubbub_version=""
-libnsgif_version=""
-libnsbmp_version=""
-libnsfb_version=""
-libcss_version=""
-fi
-
-if [ "$nssrctree" = "./" ]
-then
- nssrctree=`pwd`
-fi
-
-
-
-#testarch:
-archok=0
-if [ "$arch" = "68000" ]
-then
- archok=1
-fi
-if [ "$arch" = "68020" ]
-then
- archok=1
-fi
-if [ "$arch" = "68020-60" ]
-then
- archok=1
- openssltarget="m680x0-mint"
-fi
-if [ "$arch" = "5475" ]
-then
- archok=1
- openssltarget="cf-mint"
-fi
-
-if [ "$archok" = "0" ]
-then
- echo "Invalid arch:"$arch" valid: 68000,68020,68020-69,5475"
- exit 0
-fi
-
-if [ "$cross" = "1" ]
-then
- echo "enabling cross compiler mode"
- export CC="m68k-atari-mint-gcc"
- export LD="m68k-atari-mint-ld"
- export AR="m68k-atari-mint-ar"
- export RANLIB="m68k-atari-mint-ranlib"
- export CPP="m68k-atari-mint-cpp"
- compiler="m68k-atari-mint-gcc"
-fi
-
-
-# handle arch specific settings here.
-
-if [ "$arch" = "68000" ]
-then
- archlibdir=$userfs$prefix"/lib"
- archdir=""
-else
- archlibdir=$userfs$prefix"/lib/m"$arch
- archdir="m"$arch
-fi
-
-if [ "$arch" = "5475" ]
-then
- machineflag="cpu="$arch
-else
- machineflag=$arch
-fi
-
-
-echo "machine: " $machineflag
-incdir="-I$userfs$prefix/include"
-CFLAGS_ORG="-m$machineflag $optflags $profileflags $incdir"
-LDLAGS_ORG="-m$machineflag $profileflags"
-CFLAGS="$CFLAGS_ORG"
-LDFLAGS="$LDFLAGS_ORG"
-export CFLAGS_ORG
-export LDLAGS_ORG
-export CFLAGS
-export LDFLAGS
-
-echo "Build root: "$buildroot
-echo "Netsurf sources: "$nssrctree
-echo "Build directory: "$builddir
-echo "Patches: "$patchdir
-echo "Libdir: "$archlibdir
-echo "Dest: "$userfs
-echo "Prefix: "$prefix
-echo "Compiler: "$compiler
-echo "CFLAGS: "$CFLAGS
-echo "PKG_CONFIG_PATH=$archlibdir/pkgconfig"
-echo "PKG_CONFIG_LIBDIR=$archlibdir/pkgconfig"
-echo "PKG_CONFIG_SYSROOT_DIR=$userfs"
-echo "Dry: " $dry
-
-
-#echo "Installing RPMs:"
-#rpm -i $rpmdir""$opensslpkg
-
-#cd $buildroot
-#exit 0
-
-
-# configure flags for curl, this actually saves 30kb in the lib and about 100k in the final executable
-#./configure --disable-debug --enable-optimize --disable-ldap --disable-ldaps --disable-rtsp --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-manual -- disable-sspi --target="m"$arch
-
-# freetype configured for winfnt, truetype, raster (not smooth)
-# saves around 160kb in the lib.
-
-if [ "$dry" = "1" ]
-then
-echo "export CFLAGS=$CFLAGS"
-echo "export PKG_CONFIG_PATH=$archlibdir/pkgconfig"
-echo "export PKG_CONFIG_LIBDIR=$archlibdir/pkgconfig"
-echo "export PKG_CONFIG_SYSROOT_DIR=$userfs"
-exit 0
-fi
-
-echo "creating staging directory"
-mkdir "$userfs"
-mkdir "$userfs$prefix"
-mkdir "$userfs$prefix/include"
-mkdir "$archlibdir"
-mkdir "$archlibdir/pkgconfig"
-
-
-export PKG_CONFIG_PATH="$archlibdir/pkgconfig"
-export PKG_CONFIG_LIBDIR="$archlibdir/pkgconfig"
-export PKG_CONFIG_SYSROOT_DIR="$userfs"
-
-echo "Building Libraries..."
-cd $nssrctree
-
-#start test
-if [ "$nsonly" = "0" ]
-then
-
-echo "compiling Hermes..."
-cd $libhermespkg
-$cleanup
-./configure --disable-x86asm --disable-debug --host="m68k-atari-mint" --prefix="$userfs$prefix"
-make install
-cd ..
-
-echo "compiling iconv..."
-cd $libiconvpkg
-$cleanup
-./configure --enable-static \
- --host="m68k-atari-mint"\
- --prefix="$prefix"\
- --exec-prefix="$prefix"\
- --enable-extra-encodings\
- lt_cv_sys_max_cmd_len=65536
-make install DESTDIR=$destdir PREFIX=$prefix
-cd ..
-
-
-cd $libzlibpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
- ./configure --prefix=$prefix --static
-else
- ./configure --prefix=$prefix --static
-fi
-make
-# there is an error within make instal, copy headers manually.
-install -m644 zlib.h "$userfs$prefix/include/zlib.h"
-install -m644 zconf.h "$userfs$prefix/include/zconf.h"
-install -m644 zutil.h "$userfs$prefix/include/zutil.h"
-make install DESTDIR=$userfs PREFIX="$prefix"
-cd ..
-
-pwd
-cd $libfreetypepkg
-$cleanup
-if [ "$cross" = "1" ]
-then
-./configure --prefix="$prefix" \
- --host="m68k-atari-mint" \
- CFLAGS="$CFLAGS_ORG"
-make
-make install DESTDIR=$userfs
-else
-./configure --prefix="$userfs$prefix" --host="m68k-atari-mint" --target="m$arch" CFLAGS="$CFLAGS_ORG"
-make
-make install DESTDIR=$userfs
-fi
-
-cd ..
-
-
-cd $libopensslpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
-./Configure $openssltarget --prefix="$prefix" --install-prefix="$userfs"
-else
-./Configure $openssltarget --prefix="$prefix" --install-prefix="$userfs"
-fi
-make
-make rehash
-make install
-cd ..
-
-# FIXME: build c-ares here, if you want to
-
-cd $libcurlpkg
-$cleanup
-/configure\
- --prefix="$prefix" \
- --libdir=$prefix"/lib/$archdir"\
- --host="m68k-atari-mint"\
- --program-suffix=".ttp"\
- --with-random="/dev/urandom"\
- --enable-static\
- --enable-optimize\
- --enable-warnings\
- --enable-http\
- --enable-gopher\
- --enable-nonblocking\
- --enable-cookies\
- --disable-libtool-lock\
- --disable-verbose\
- --disable-shared\
- --disable-dependency-tracking\
- --disable-manual\
- --disable-curldebug\
- --disable-debug\
- --disable-ipv6\
- --disable-largefile\
- --disable-thread\
- --disable-threaded-resolver\
- --disable-telnet\
- --disable-tftp\
- --disable-dict\
- --disable-pop3\
- --disable-imap\
- --disable-smtp\
- --disable-ldaps\
- --disable-ldap\
- --disable-rtsp\
- --disable-sspi\
- --disable-rtsp\
- --without-polarssl\
- --without-cyassl\
- --without-nss\
- --without-libssh2\
- --without-librtmp\
- --without-libidn\
- --without-gnutls
-# --with-ares="/usr/m68k-atari-mint/lib/"$archdir\
-# --enable-ares
-
-make CFLAGS="$CFLAGS_ORG"
-make install DESTDIR="$userfs"
-cd ..
-
-cd $libjpegpkg
-./configure --enable-static --prefix="$userfs$prefix" --host="m68k-atari-mint"
-make install
-cd ..
-
-cd $libpngpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
- ./configure --prefix=$prefix --host=m68k-atari-mint
-else
- ./configure --prefix=$prefix
-fi
-
-make
-make install DESTDIR="$userfs"
-cd ..
-
-# we only need header files of ldg...
-#cd $libldgpkg
-#cp ./include/ldg.h "$userfs$prefix/include"
-#cd ..
-
-cd windom
-cd src
-rm ../lib/gcc/libwindom.a
-$cleanup
-export M68K_ATARI_MINT_CFLAGS="$CFLAGS"
-echo $M68K_ATARI_MINT_CFLAGS
-echo "dest:" $userfs$prefix
-if [ "$cross" = "1" ]
-then
-make cross
-cp ../lib/gcc/libwindom.a "$userfs$prefix/lib"
-cp ../include/* "$userfs$prefix/include/" -R
-else
-make -f gcc.mak
-cp ./lib/gcc/libwindom.a "$userfs$prefix/lib"
-cp ./include/* "$userfs$prefix/include/" -R
-fi
-cd ../..
-
-fi # END OF TEST
-
-# set TARGET, so that make clean and build use the same directory.
-export TARGET="freemint"
-
-echo "compiling libparserutils..."
-cd libparserutils/$libparserutils_version
-export CFLAGS="$CFLAGS_ORG -DWITH_ICONV_FILTER"
-$cleanup
-if [ "$cross" = "1" ]
-then
- make TARGET="freemint"
- make install DESTDIR="$userfs" PREFIX="$prefix" TARGET="freemint"
-else
-# make install DESTDIR="$userfs" PREFIX="$prefix"
- make install DESTDIR="$archlibdir" PREFIX="$prefix"
-fi
-cd $nssrctree
-export CFLAGS="$CFLAGS_ORG"
-
-
-echo "compiling libwapcaplet..."
-cd libwapcaplet/$libwapcaplet_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
- #make install DESTDIR="$userfs/$archdir" TARGET="freemint"
- #PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
- #make install DESTDIR="$archlibdir" PREFIX=$prefix
-fi
-cd $nssrctree
-
-cd libcss/$libcss_version
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-# make install DESTDIR="$archlibdir" TARGET="freemint"
-#PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-# make install DESTDIR="$archlibdir" PREFIX=$prefix
-fi
-cd $nssrctree
-
-echo "compiling hubbub..."
-pwd
-cd hubbub/$hubbub_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-fi
-cd $nssrctree
-
-
-echo "compiling libnsgif..."
-cd libnsgif/$libnsgif_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-fi
-cd $nssrctree
-
-echo "compiling libnsbmp..."
-cd libnsbmp/$libnsbmp_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-fi
-cd $nssrctree
-
-
-if [ "$withnsfb" = "1" ]
-then
- echo "compiling libnsfb..."
- cd libnsfb/$libnsfb_version || exit 1
- $cleanup
- if [ "$cross" = "1" ]
- then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
- else
- make install DESTDIR=$userfs PREFIX=$prefix
- fi
- cd $nssrctree
-else
- echo "libnsfb skipped"
-fi
-
-
-if [ "$arch" = "68000" ]
-then
- echo "No library relocation needed!"
-else
- echo "Relocation Libraries to :"
- echo $archlibdir
- srclibdir=$userfs$prefix"/lib/"
- srcpkgdir=$userfs$prefix"/lib/pkgconfig"
- mkdir $archlibdir
- rm $archlib/*.a
- mv $srclibdir*.a $archlibdir/ -v
- mv $srcpkgdir $archlibdir -v
-fi
-
-echo "please add symlink to freetype2/freetype within /usr/m68k-atari-mint/include"
-exit 0
diff --git a/atari/scripts/mkpkg.sh b/atari/scripts/mkpkg.sh
deleted file mode 100755
index 419e699..0000000
--- a/atari/scripts/mkpkg.sh
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/bash
-
-# this is an small build script to create an package for nsgem
-# invoke: mkpkg.sh [-s,-d,-8,-fonts]
-#
-# Parameters:
-#
-# -8
-# Description: The package will be build for 8.3 filesystems
-# This also defines the -fonts parameter
-#
-# -fonts
-# Description: The package will include the DejaVu fonts package
-# ( 8.3 compatible names )
-#
-# -fpath
-# Description: Set path to dejavu Fonts
-#
-# -s (srcpath)
-# Description: use it like: -s "path to netsurf root" to configure from which
-# directory the package files are taken.
-# The Path must have trailing slash!
-#
-# -d (dstpath)
-# Description: use it like: -d "path to dir where the package will be placed"
-# to configure the output path of this script.
-# The path mus have trailing slash!
-#
-
-# config variable, set default values
-src="/usr/src/netsurf-2.9/release/netsurf/2.9/"
-dst="/tmp/nspkg/"
-shortfs=0
-inc_short_fonts=0
-font_src="/usr/share/fonts/truetype/ttf-dejavu/"
-framebuffer=0
-
-while [ "$1" != "" ] # When there are arguments...
-do # Process the next one
- case $1 # Look at $1
- in
- -8)
- shortfs="1"
- shift
- ;;
-
- -fonts)
- inc_short_fonts="1"
- shift
- ;;
-
- -fpath)
- shift
- font_src=$1
- shift
- ;;
-
- -d)
- shift
- dst=$1
- shift
- ;;
-
- -s)
- shift
- src=$1
- shift
- ;;
-
- *) echo "Option [$1] not one of [-8,-fonts,-d,-s,-fpath]";
- exit;;
-
- esac
-done
-
-echo "Building from: "$src
-echo "Building in: "$dst
-echo "Building for short fs: "$shortfs
-
-if [ "$shortfs" = "1" ]
-then
- inc_short_fonts=1
-fi
-
-if [ -d "$font_src" ]
-then
- echo "Found fonts in $font_src"
-else
- echo "Error: TTF Fonts not found ($font_src)!"
- exit 0
-fi
-
-set -o verbose
-rm $dst -r
-mkdir $dst
-mkdir $dst"download"
-mkdir $dst"res"
-mkdir $dst"res/icons"
-mkdir $dst"res/fonts"
-touch $dst"res/cookies"
-cp $src"atari/doc" $dst -R
-cp $src"ns.prg" $dst
-cp $src"ChangeLog" $dst
-chmod +x $dst"ns.prg"
-m68k-atari-mint-strip $dst"ns.prg"
-m68k-atari-mint-stack -S 256k $dst"ns.prg"
-
-cp $src"atari/res/" $dst -rL
-cp $src"!NetSurf/Resources/AdBlock,f79" $dst"res/adblock.css" -rL
-cp $src"!NetSurf/Resources/CSS,f79" $dst"res/default.css" -rL
-cp $src"!NetSurf/Resources/Quirks,f79" $dst"res/quirks.css" -rL
-cp $src"!NetSurf/Resources/internal.css,f79" $dst"res/internal.css" -rL
-cp $src"!NetSurf/Resources/SearchEngines" $dst"res/search" -rL
-cp $src"!NetSurf/Resources/ca-bundle" $dst"res/cabundle" -rL
-cp $src"!NetSurf/Resources/en/Messages" $dst"res/messages" -rL
-cp $src"!NetSurf/Resources/Icons/content.png" $dst"res/icons/content.png" -rL
-cp $src"!NetSurf/Resources/Icons/directory.png" $dst"res/icons/dir.png" -rL
-
-#remove uneeded files:
-rm $dst"res/netsurf.rsm"
-rm $dst"res/netsurf.rsh"
-rm $dst"res/.svn" -r
-rm $dst"res/icons/.svn" -r
-rm $dst"res/fonts/.svn" -r
-rm $dst"doc/.svn" -r
-rm $dst"download/.svn" -r
-
-if [ "$inc_short_fonts" = "1" ]
-then
- cp $font_src"DejaVuSans.ttf" $dst"res/fonts/ss.ttf"
- cp $font_src"DejaVuSans-Bold.ttf" $dst"res/fonts/ssb.ttf"
- cp $font_src"DejaVuSans-Oblique.ttf" $dst"res/fonts/ssi.ttf"
- cp $font_src"DejaVuSans-BoldOblique.ttf" $dst"res/fonts/ssib.ttf"
- cp $font_src"DejaVuSansMono.ttf" $dst"res/fonts/mono.ttf"
- cp $font_src"DejaVuSansMono-Bold.ttf" $dst"res/fonts/monob.ttf"
- cp $font_src"DejaVuSansMono-Oblique.ttf" $dst"res/fonts/cursive.ttf"
- cp $font_src"DejaVuSerif.ttf" $dst"res/fonts/s.ttf"
- cp $font_src"DejaVuSerif-Bold.ttf" $dst"res/fonts/sb.ttf"
- cp $font_src"DejaVuSerifCondensed-Bold.ttf" $dst"res/fonts/fantasy.ttf"
-fi
-
-#create an simple startup script:
-if [ "$framebuffer" = "1" ]
-then
-echo "NETSURFRES=./res/
-export NETSURFRES
-./nsfb.prg -v file:///f/" > $dst"ns.sh"
-chmod +x $dst"ns.sh"
-fi
-
-echo "
-atari_screen_driver:vdi
-# select font driver, available values: freetype, internal
-atari_font_driver:freetype
-atari_transparency:1
-atari_realtime_move:1
-# uncomment the following to show source within editor:
-#atari_editor:/path/to/editor.app
-
-# url to start netsurf with ( and new windows )
-homepage_url:file://./res/blank
-
-#configure css font settings:
-font_size:130
-font_min_size:120
-
-# 20 MB Cache as default:
-memory_cache_size:2048512
-
-# this actually hides advertisements, it still generates network traffic:
-block_advertisements:0
-
-#network configuration:
-send_referer:1
-http_proxy:0
-http_proxy_host:
-http_proxy_port:8123
-http_proxy_auth:0
-http_proxy_auth_user:
-http_proxy_auth_pass:
-suppress_curl_debug:1
-
-# animation configuration ( GIF ):
-minimum_gif_delay:50
-animate_images:1
-
-foreground_images:1
-background_images:1
-
-
-# path configuration
-ca_bundle:./res/cabundle
-ca_path:./res/certs
-cookie_file:./res/cookies
-url_file:./res/url.db
-tree_icons_path:./res/icons
-downloads_path:./download
-hotlist_file:./res/hotlist
-
-# enable reflow for interactive content and during fetch:
-incremental_reflow:1
-# reformat time during fetch:
-min_reflow_period:2500
-core_select_menu:1
-max_fetchers:3
-max_fetchers_per_host:2
-max_cached_fetch_handles:5
-
-# allow target=_blank (link opens in new window):
-target_blank:1
-
-# options nowhere used currently follow:
-
-# suppres images when exporting pages (to PDF):
-# suppress_images:0
-# turn off backgrounds for printed content:
-#remove_backgrounds:0
-# smooth resizing:
-#render_resample:1
-# enable loosening for printed content:
-#enable_loosening:1
-# configure disc cache ( currently not implemented )
-#option_disc_cache_age:28
-#configure urldb (url search):
-#expire_url:28
-#hover_urls:1
-" > $dst"Choices"
-
-cd $dst
-tar cvf - ./* | gzip -9 -c > netsurf.tar.gz
-zip netsurf.zip -9 -r ./ -x netsurf.tar.gz
-
-echo
-exit 0
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5e261a363de737d4f93...
commit 5e261a363de737d4f937fd920725271b58ba9fd7
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added environment scripts for m68020-60 and v4e builds
diff --git a/atari/scripts/env-v4e.sh b/atari/scripts/env-v4e.sh
new file mode 100755
index 0000000..6e353ff
--- /dev/null
+++ b/atari/scripts/env-v4e.sh
@@ -0,0 +1,7 @@
+export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf-v4e/m5475-atari-mint/cross/bin/
+export GCCSDK_INSTALL_ENV="/opt/netsurf-v4e/m5475-atari-mint/env"
+export PATH=/opt/netsurf-v4e/m5475-atari-mint/cross/bin:$PATH
+export PREFIX=/opt/netsurf-v4e/
+export LD_LIBRARY_PATH=/opt/netsurf-v4e/m5475-atari-mint/lib:/opt/netsurf-v4e/m5475-atari-mint/env/lib/
+export PKG_CONFIG_PATH=/opt/netsurf-v4e/m5475-atari-mint/env/lib/pkgconfig:/opt/netsurf-v4e/lib/pkgconfig
+export C_INCLUDE_PATH=/opt/netsurf-v4e/include/:/opt/netsurf-v4e/m5475-atari-mint/env/include/
diff --git a/atari/scripts/env-x86.sh b/atari/scripts/env-x86.sh
new file mode 100755
index 0000000..027da3f
--- /dev/null
+++ b/atari/scripts/env-x86.sh
@@ -0,0 +1,9 @@
+#export PKG_CONFIG_PATH=${HOME}/netsurf/workspace_gtk/inst/lib/pkgconfig::
+#export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HOME}/netsurf/workspace_gtk/inst/lib
+#export PREFIX=${HOME}/netsurf/workspace_gtk/inst
+
+export PATH=/opt/netsurf/x86/bin:$PATH
+export PREFIX=/opt/netsurf/x86
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/netsurf/x86/lib
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/netsurf/x86/lib/pkgconfig
+
-----------------------------------------------------------------------
Summary of changes:
atari/scripts/env-v4e.sh | 7 +
atari/scripts/env-x86.sh | 9 +
atari/scripts/make.sh | 88 -------
atari/scripts/makelibs.sh | 591 ---------------------------------------------
atari/scripts/mkpkg.sh | 234 ------------------
5 files changed, 16 insertions(+), 913 deletions(-)
create mode 100755 atari/scripts/env-v4e.sh
create mode 100755 atari/scripts/env-x86.sh
delete mode 100755 atari/scripts/make.sh
delete mode 100755 atari/scripts/makelibs.sh
delete mode 100755 atari/scripts/mkpkg.sh
diff --git a/atari/scripts/env-v4e.sh b/atari/scripts/env-v4e.sh
new file mode 100755
index 0000000..6e353ff
--- /dev/null
+++ b/atari/scripts/env-v4e.sh
@@ -0,0 +1,7 @@
+export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf-v4e/m5475-atari-mint/cross/bin/
+export GCCSDK_INSTALL_ENV="/opt/netsurf-v4e/m5475-atari-mint/env"
+export PATH=/opt/netsurf-v4e/m5475-atari-mint/cross/bin:$PATH
+export PREFIX=/opt/netsurf-v4e/
+export LD_LIBRARY_PATH=/opt/netsurf-v4e/m5475-atari-mint/lib:/opt/netsurf-v4e/m5475-atari-mint/env/lib/
+export PKG_CONFIG_PATH=/opt/netsurf-v4e/m5475-atari-mint/env/lib/pkgconfig:/opt/netsurf-v4e/lib/pkgconfig
+export C_INCLUDE_PATH=/opt/netsurf-v4e/include/:/opt/netsurf-v4e/m5475-atari-mint/env/include/
diff --git a/atari/scripts/env-x86.sh b/atari/scripts/env-x86.sh
new file mode 100755
index 0000000..027da3f
--- /dev/null
+++ b/atari/scripts/env-x86.sh
@@ -0,0 +1,9 @@
+#export PKG_CONFIG_PATH=${HOME}/netsurf/workspace_gtk/inst/lib/pkgconfig::
+#export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HOME}/netsurf/workspace_gtk/inst/lib
+#export PREFIX=${HOME}/netsurf/workspace_gtk/inst
+
+export PATH=/opt/netsurf/x86/bin:$PATH
+export PREFIX=/opt/netsurf/x86
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/netsurf/x86/lib
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/netsurf/x86/lib/pkgconfig
+
diff --git a/atari/scripts/make.sh b/atari/scripts/make.sh
deleted file mode 100755
index bea956e..0000000
--- a/atari/scripts/make.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-arch="68000"
-#arch="68020-60"
-#arch="5475"
-prefix="/usr/m68k-atari-mint/"
-libdir=$prefix"lib/"
-outfile="ns.prg"
-release="0"
-
-while [ "$1" != "" ] # When there are arguments...
-do # Process the next one
- case $1 # Look at $1
- in
- -arch)
- shift
- arch=$1
- shift
- ;;
-
- -prefix)
- shift
- prefix=$1
- shift
- ;;
-
- -release)
- release="1"
- shift
- ;;
-
- *)
- echo "Unknown commandline option"
- exit;;
- esac
-done
-
-libdir=$prefix"lib/"
-
-
-if [ "$arch" = "68000" ]
-then
-echo "Default m68000 build."
-else
-libdir="$libdir/m$arch/"
-fi
-
-if [ "$arch" = "68020-60" ]
-then
-outfile="ns020.prg"
-fi
-
-if [ "$arch" = "5475" ]
-then
-outfile="nscf.prg"
-fi
-
-
-echo "compiling: " $outfile
-echo
-
-
-
-pkgconfdir="$libdir"pkgconfig
-export PKG_CONFIG_PATH=$pkgconfdir
-export PKG_CONFIG_LIBDIR=$pkgconfdir
-
-#env
-
-echo "ibdir: $libdir"
-echo "pkgconfdir: $pkgconfdir"
-echo "arch: $arch"
-
-
-echo PKG_CONFIG_PATH="$pkgconfdir" PKG_CONFIG_LIBDIR="$pkgconfdir" AS="m68k-atari-mint-as" CC="m68k-atari-mint-gcc" LD="m68k-atari-mint-ld" AR="m68k-atari-mint-ar" RANLIB="m68k-atari-mint-ranlib" make TARGET="atari"
-PKG_CONFIG_PATH="$pkgconfdir" PKG_CONFIG_LIBDIR="$pkgconfdir" AS="m68k-atari-mint-as" CC="m68k-atari-mint-gcc" LD="m68k-atari-mint-ld" AR="m68k-atari-mint-ar" RANLIB="m68k-atari-mint-ranlib" make TARGET="atari"
-if [ "$arch" != "68000" ]
-then
-mv ns.prg $outfile
-fi
-
-
-if [ "$release" = "1" ]
-then
-echo Stripping $outfile ...
-m68k-atari-mint-strip $outfile
-fi
-
-
diff --git a/atari/scripts/makelibs.sh b/atari/scripts/makelibs.sh
deleted file mode 100755
index 80c3161..0000000
--- a/atari/scripts/makelibs.sh
+++ /dev/null
@@ -1,591 +0,0 @@
-#!/bin/sh
-
-#todo: cflib, libcurl -> ensure ssl support, force ssl support
-
-#example usage:
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68000 -cross -nsonly -clean -src ./
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68020 -cross -arch 68020 -nsonly -clean -src ./
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68020-60 -cross -arch 68020-60 -nsonly -clean -src ./
-#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m5475 -cross -arch 5475 -clean
-
-# option description:
-#
-#-buildroot - this option tells the script where it is located, only needen when the script isn|t located in cwd.
-#-arch - specifiy architecture type (format: 68000, 68020, 5475 etc...)
-#-src - tell the tool where the sources for the ns libs are located
-#-prefix - what prefix to use ( -prefix local )
-#-dest - where to install result files, this should NOT point to /usr or something like that!!! Its a temporary folder.
-#-optflags
-#-with-nsfb - compile with libnsfb
-#-cross - set up some cross-compiler vars
-#-clean - clean source dirs before building
-#-nsonly - only build netsurf libs
-#-dry - only set environment variables, echo them and then exit the script
-#-release - compile from release svn tree
-
-buildroot=`pwd`"/"
-libopensslpkg="openssl-0.9.8r"
-libpngpkg="libpng-1.5.10"
-libzlibpkg="zlib-1.2.5"
-libldgpkg="ldg-dev-2.33"
-libiconvpkg="libiconv-1.13.1"
-libcurlpkg="curl-7.25.0"
-libfreetypepkg="freetype-2.4.9"
-libhermespkg="Hermes-1.3.3"
-libjpegpkg="jpeg-8b"
-libparserutils_version=0.1.1
-libwapcaplet_version=0.1.1
-hubbub_version=0.1.2
-libnsgif_version=0.0.3
-libnsbmp_version=0.0.3
-libnsfb_version=0.0.2
-libcss_version=0.1.2
-arch="68000"
-archdir=""
-debugmode="1"
-profileflags=""
-optflags="-O2"
-withnsfb="1"
-prefix="/usr"
-userfs=$buildroot"userfs"
-patchdir=$buildroot"patches/"
-builddir=$buildroot"build/"
-rpmdir=$buildroot"packages/"
-nssrctree=$buildroot
-compiler="gcc"
-cross="0"
-cleanup="echo no cleaning"
-ssltarget="m68k-mint"
-dry="0"
-nsonly="0"
-release="0"
-
-if [ "$CC" != "" ]
-then
- compiler=$CC
-fi
-
-while [ "$1" != "" ] # When there are arguments...
-do # Process the next one
- case $1 # Look at $1
- in
- -dummy)
- dummy="1"
- shift
- ;;
-
- -p)
- profileflags="-pg"
- shift
- ;;
-
- -buildroot)
- shift
- buildroot=$1
- userfs=$buildroot"userfs"
- patchdir=$buildroot"patches/"
- builddir=$buildroot"build/"
- rpmdir=$buildroot"packages/"
- nssrctree=$buildroot"src/"
- shift
- ;;
-
- -arch)
- shift
- arch=$1
- shift
- ;;
-
- -src)
- shift
- nssrctree=$1
- shift
- ;;
-
- -prefix)
- shift
- prefix=$1
- shift
- ;;
-
- -release)
- release="1"
- shift
- ;;
-
- -dest)
- shift
- userfs=$1
- shift
- ;;
-
- -optflags)
- shift
- optflags=$1
- shift
- ;;
-
- -with-nsfb)
- withnsfb="1"
- shift
- ;;
-
- -cross )
- cross="1"
- shift
- ;;
-
- -nsonly )
- nsonly="1"
- shift
- ;;
-
- -clean )
- cleanup="make clean && make distclean"
- shift
- ;;
-
- -dry )
- dry="1"
- shift
- ;;
-
- *) echo "Option [$1] not one of [-buildroot,-arch,-src,-prefix,-dest,-optflags,-with-nsfb]";
- exit;;
- esac
-done
-
-
-if [ -d "$buildroot" ]
-then
- echo "Buildroot: $buildroot"
-else
- echo "Invalid buildroot directory ("$buildroot") !"
- echo "This script must know where it is located!"
- echo "Either use buildroot option or start from directory where the script is located."
- exit 0
-fi
-
-if [ "$release" = "0" ]
-then
-libparserutils_version=""
-libwapcaplet_version=""
-hubbub_version=""
-libnsgif_version=""
-libnsbmp_version=""
-libnsfb_version=""
-libcss_version=""
-fi
-
-if [ "$nssrctree" = "./" ]
-then
- nssrctree=`pwd`
-fi
-
-
-
-#testarch:
-archok=0
-if [ "$arch" = "68000" ]
-then
- archok=1
-fi
-if [ "$arch" = "68020" ]
-then
- archok=1
-fi
-if [ "$arch" = "68020-60" ]
-then
- archok=1
- openssltarget="m680x0-mint"
-fi
-if [ "$arch" = "5475" ]
-then
- archok=1
- openssltarget="cf-mint"
-fi
-
-if [ "$archok" = "0" ]
-then
- echo "Invalid arch:"$arch" valid: 68000,68020,68020-69,5475"
- exit 0
-fi
-
-if [ "$cross" = "1" ]
-then
- echo "enabling cross compiler mode"
- export CC="m68k-atari-mint-gcc"
- export LD="m68k-atari-mint-ld"
- export AR="m68k-atari-mint-ar"
- export RANLIB="m68k-atari-mint-ranlib"
- export CPP="m68k-atari-mint-cpp"
- compiler="m68k-atari-mint-gcc"
-fi
-
-
-# handle arch specific settings here.
-
-if [ "$arch" = "68000" ]
-then
- archlibdir=$userfs$prefix"/lib"
- archdir=""
-else
- archlibdir=$userfs$prefix"/lib/m"$arch
- archdir="m"$arch
-fi
-
-if [ "$arch" = "5475" ]
-then
- machineflag="cpu="$arch
-else
- machineflag=$arch
-fi
-
-
-echo "machine: " $machineflag
-incdir="-I$userfs$prefix/include"
-CFLAGS_ORG="-m$machineflag $optflags $profileflags $incdir"
-LDLAGS_ORG="-m$machineflag $profileflags"
-CFLAGS="$CFLAGS_ORG"
-LDFLAGS="$LDFLAGS_ORG"
-export CFLAGS_ORG
-export LDLAGS_ORG
-export CFLAGS
-export LDFLAGS
-
-echo "Build root: "$buildroot
-echo "Netsurf sources: "$nssrctree
-echo "Build directory: "$builddir
-echo "Patches: "$patchdir
-echo "Libdir: "$archlibdir
-echo "Dest: "$userfs
-echo "Prefix: "$prefix
-echo "Compiler: "$compiler
-echo "CFLAGS: "$CFLAGS
-echo "PKG_CONFIG_PATH=$archlibdir/pkgconfig"
-echo "PKG_CONFIG_LIBDIR=$archlibdir/pkgconfig"
-echo "PKG_CONFIG_SYSROOT_DIR=$userfs"
-echo "Dry: " $dry
-
-
-#echo "Installing RPMs:"
-#rpm -i $rpmdir""$opensslpkg
-
-#cd $buildroot
-#exit 0
-
-
-# configure flags for curl, this actually saves 30kb in the lib and about 100k in the final executable
-#./configure --disable-debug --enable-optimize --disable-ldap --disable-ldaps --disable-rtsp --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-manual -- disable-sspi --target="m"$arch
-
-# freetype configured for winfnt, truetype, raster (not smooth)
-# saves around 160kb in the lib.
-
-if [ "$dry" = "1" ]
-then
-echo "export CFLAGS=$CFLAGS"
-echo "export PKG_CONFIG_PATH=$archlibdir/pkgconfig"
-echo "export PKG_CONFIG_LIBDIR=$archlibdir/pkgconfig"
-echo "export PKG_CONFIG_SYSROOT_DIR=$userfs"
-exit 0
-fi
-
-echo "creating staging directory"
-mkdir "$userfs"
-mkdir "$userfs$prefix"
-mkdir "$userfs$prefix/include"
-mkdir "$archlibdir"
-mkdir "$archlibdir/pkgconfig"
-
-
-export PKG_CONFIG_PATH="$archlibdir/pkgconfig"
-export PKG_CONFIG_LIBDIR="$archlibdir/pkgconfig"
-export PKG_CONFIG_SYSROOT_DIR="$userfs"
-
-echo "Building Libraries..."
-cd $nssrctree
-
-#start test
-if [ "$nsonly" = "0" ]
-then
-
-echo "compiling Hermes..."
-cd $libhermespkg
-$cleanup
-./configure --disable-x86asm --disable-debug --host="m68k-atari-mint" --prefix="$userfs$prefix"
-make install
-cd ..
-
-echo "compiling iconv..."
-cd $libiconvpkg
-$cleanup
-./configure --enable-static \
- --host="m68k-atari-mint"\
- --prefix="$prefix"\
- --exec-prefix="$prefix"\
- --enable-extra-encodings\
- lt_cv_sys_max_cmd_len=65536
-make install DESTDIR=$destdir PREFIX=$prefix
-cd ..
-
-
-cd $libzlibpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
- ./configure --prefix=$prefix --static
-else
- ./configure --prefix=$prefix --static
-fi
-make
-# there is an error within make instal, copy headers manually.
-install -m644 zlib.h "$userfs$prefix/include/zlib.h"
-install -m644 zconf.h "$userfs$prefix/include/zconf.h"
-install -m644 zutil.h "$userfs$prefix/include/zutil.h"
-make install DESTDIR=$userfs PREFIX="$prefix"
-cd ..
-
-pwd
-cd $libfreetypepkg
-$cleanup
-if [ "$cross" = "1" ]
-then
-./configure --prefix="$prefix" \
- --host="m68k-atari-mint" \
- CFLAGS="$CFLAGS_ORG"
-make
-make install DESTDIR=$userfs
-else
-./configure --prefix="$userfs$prefix" --host="m68k-atari-mint" --target="m$arch" CFLAGS="$CFLAGS_ORG"
-make
-make install DESTDIR=$userfs
-fi
-
-cd ..
-
-
-cd $libopensslpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
-./Configure $openssltarget --prefix="$prefix" --install-prefix="$userfs"
-else
-./Configure $openssltarget --prefix="$prefix" --install-prefix="$userfs"
-fi
-make
-make rehash
-make install
-cd ..
-
-# FIXME: build c-ares here, if you want to
-
-cd $libcurlpkg
-$cleanup
-/configure\
- --prefix="$prefix" \
- --libdir=$prefix"/lib/$archdir"\
- --host="m68k-atari-mint"\
- --program-suffix=".ttp"\
- --with-random="/dev/urandom"\
- --enable-static\
- --enable-optimize\
- --enable-warnings\
- --enable-http\
- --enable-gopher\
- --enable-nonblocking\
- --enable-cookies\
- --disable-libtool-lock\
- --disable-verbose\
- --disable-shared\
- --disable-dependency-tracking\
- --disable-manual\
- --disable-curldebug\
- --disable-debug\
- --disable-ipv6\
- --disable-largefile\
- --disable-thread\
- --disable-threaded-resolver\
- --disable-telnet\
- --disable-tftp\
- --disable-dict\
- --disable-pop3\
- --disable-imap\
- --disable-smtp\
- --disable-ldaps\
- --disable-ldap\
- --disable-rtsp\
- --disable-sspi\
- --disable-rtsp\
- --without-polarssl\
- --without-cyassl\
- --without-nss\
- --without-libssh2\
- --without-librtmp\
- --without-libidn\
- --without-gnutls
-# --with-ares="/usr/m68k-atari-mint/lib/"$archdir\
-# --enable-ares
-
-make CFLAGS="$CFLAGS_ORG"
-make install DESTDIR="$userfs"
-cd ..
-
-cd $libjpegpkg
-./configure --enable-static --prefix="$userfs$prefix" --host="m68k-atari-mint"
-make install
-cd ..
-
-cd $libpngpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
- ./configure --prefix=$prefix --host=m68k-atari-mint
-else
- ./configure --prefix=$prefix
-fi
-
-make
-make install DESTDIR="$userfs"
-cd ..
-
-# we only need header files of ldg...
-#cd $libldgpkg
-#cp ./include/ldg.h "$userfs$prefix/include"
-#cd ..
-
-cd windom
-cd src
-rm ../lib/gcc/libwindom.a
-$cleanup
-export M68K_ATARI_MINT_CFLAGS="$CFLAGS"
-echo $M68K_ATARI_MINT_CFLAGS
-echo "dest:" $userfs$prefix
-if [ "$cross" = "1" ]
-then
-make cross
-cp ../lib/gcc/libwindom.a "$userfs$prefix/lib"
-cp ../include/* "$userfs$prefix/include/" -R
-else
-make -f gcc.mak
-cp ./lib/gcc/libwindom.a "$userfs$prefix/lib"
-cp ./include/* "$userfs$prefix/include/" -R
-fi
-cd ../..
-
-fi # END OF TEST
-
-# set TARGET, so that make clean and build use the same directory.
-export TARGET="freemint"
-
-echo "compiling libparserutils..."
-cd libparserutils/$libparserutils_version
-export CFLAGS="$CFLAGS_ORG -DWITH_ICONV_FILTER"
-$cleanup
-if [ "$cross" = "1" ]
-then
- make TARGET="freemint"
- make install DESTDIR="$userfs" PREFIX="$prefix" TARGET="freemint"
-else
-# make install DESTDIR="$userfs" PREFIX="$prefix"
- make install DESTDIR="$archlibdir" PREFIX="$prefix"
-fi
-cd $nssrctree
-export CFLAGS="$CFLAGS_ORG"
-
-
-echo "compiling libwapcaplet..."
-cd libwapcaplet/$libwapcaplet_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
- #make install DESTDIR="$userfs/$archdir" TARGET="freemint"
- #PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
- #make install DESTDIR="$archlibdir" PREFIX=$prefix
-fi
-cd $nssrctree
-
-cd libcss/$libcss_version
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-# make install DESTDIR="$archlibdir" TARGET="freemint"
-#PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-# make install DESTDIR="$archlibdir" PREFIX=$prefix
-fi
-cd $nssrctree
-
-echo "compiling hubbub..."
-pwd
-cd hubbub/$hubbub_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-fi
-cd $nssrctree
-
-
-echo "compiling libnsgif..."
-cd libnsgif/$libnsgif_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-fi
-cd $nssrctree
-
-echo "compiling libnsbmp..."
-cd libnsbmp/$libnsbmp_version || exit 1
-$cleanup
-if [ "$cross" = "1" ]
-then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
-else
- make install DESTDIR=$userfs PREFIX=$prefix
-fi
-cd $nssrctree
-
-
-if [ "$withnsfb" = "1" ]
-then
- echo "compiling libnsfb..."
- cd libnsfb/$libnsfb_version || exit 1
- $cleanup
- if [ "$cross" = "1" ]
- then
- make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
- else
- make install DESTDIR=$userfs PREFIX=$prefix
- fi
- cd $nssrctree
-else
- echo "libnsfb skipped"
-fi
-
-
-if [ "$arch" = "68000" ]
-then
- echo "No library relocation needed!"
-else
- echo "Relocation Libraries to :"
- echo $archlibdir
- srclibdir=$userfs$prefix"/lib/"
- srcpkgdir=$userfs$prefix"/lib/pkgconfig"
- mkdir $archlibdir
- rm $archlib/*.a
- mv $srclibdir*.a $archlibdir/ -v
- mv $srcpkgdir $archlibdir -v
-fi
-
-echo "please add symlink to freetype2/freetype within /usr/m68k-atari-mint/include"
-exit 0
diff --git a/atari/scripts/mkpkg.sh b/atari/scripts/mkpkg.sh
deleted file mode 100755
index 419e699..0000000
--- a/atari/scripts/mkpkg.sh
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/bash
-
-# this is an small build script to create an package for nsgem
-# invoke: mkpkg.sh [-s,-d,-8,-fonts]
-#
-# Parameters:
-#
-# -8
-# Description: The package will be build for 8.3 filesystems
-# This also defines the -fonts parameter
-#
-# -fonts
-# Description: The package will include the DejaVu fonts package
-# ( 8.3 compatible names )
-#
-# -fpath
-# Description: Set path to dejavu Fonts
-#
-# -s (srcpath)
-# Description: use it like: -s "path to netsurf root" to configure from which
-# directory the package files are taken.
-# The Path must have trailing slash!
-#
-# -d (dstpath)
-# Description: use it like: -d "path to dir where the package will be placed"
-# to configure the output path of this script.
-# The path mus have trailing slash!
-#
-
-# config variable, set default values
-src="/usr/src/netsurf-2.9/release/netsurf/2.9/"
-dst="/tmp/nspkg/"
-shortfs=0
-inc_short_fonts=0
-font_src="/usr/share/fonts/truetype/ttf-dejavu/"
-framebuffer=0
-
-while [ "$1" != "" ] # When there are arguments...
-do # Process the next one
- case $1 # Look at $1
- in
- -8)
- shortfs="1"
- shift
- ;;
-
- -fonts)
- inc_short_fonts="1"
- shift
- ;;
-
- -fpath)
- shift
- font_src=$1
- shift
- ;;
-
- -d)
- shift
- dst=$1
- shift
- ;;
-
- -s)
- shift
- src=$1
- shift
- ;;
-
- *) echo "Option [$1] not one of [-8,-fonts,-d,-s,-fpath]";
- exit;;
-
- esac
-done
-
-echo "Building from: "$src
-echo "Building in: "$dst
-echo "Building for short fs: "$shortfs
-
-if [ "$shortfs" = "1" ]
-then
- inc_short_fonts=1
-fi
-
-if [ -d "$font_src" ]
-then
- echo "Found fonts in $font_src"
-else
- echo "Error: TTF Fonts not found ($font_src)!"
- exit 0
-fi
-
-set -o verbose
-rm $dst -r
-mkdir $dst
-mkdir $dst"download"
-mkdir $dst"res"
-mkdir $dst"res/icons"
-mkdir $dst"res/fonts"
-touch $dst"res/cookies"
-cp $src"atari/doc" $dst -R
-cp $src"ns.prg" $dst
-cp $src"ChangeLog" $dst
-chmod +x $dst"ns.prg"
-m68k-atari-mint-strip $dst"ns.prg"
-m68k-atari-mint-stack -S 256k $dst"ns.prg"
-
-cp $src"atari/res/" $dst -rL
-cp $src"!NetSurf/Resources/AdBlock,f79" $dst"res/adblock.css" -rL
-cp $src"!NetSurf/Resources/CSS,f79" $dst"res/default.css" -rL
-cp $src"!NetSurf/Resources/Quirks,f79" $dst"res/quirks.css" -rL
-cp $src"!NetSurf/Resources/internal.css,f79" $dst"res/internal.css" -rL
-cp $src"!NetSurf/Resources/SearchEngines" $dst"res/search" -rL
-cp $src"!NetSurf/Resources/ca-bundle" $dst"res/cabundle" -rL
-cp $src"!NetSurf/Resources/en/Messages" $dst"res/messages" -rL
-cp $src"!NetSurf/Resources/Icons/content.png" $dst"res/icons/content.png" -rL
-cp $src"!NetSurf/Resources/Icons/directory.png" $dst"res/icons/dir.png" -rL
-
-#remove uneeded files:
-rm $dst"res/netsurf.rsm"
-rm $dst"res/netsurf.rsh"
-rm $dst"res/.svn" -r
-rm $dst"res/icons/.svn" -r
-rm $dst"res/fonts/.svn" -r
-rm $dst"doc/.svn" -r
-rm $dst"download/.svn" -r
-
-if [ "$inc_short_fonts" = "1" ]
-then
- cp $font_src"DejaVuSans.ttf" $dst"res/fonts/ss.ttf"
- cp $font_src"DejaVuSans-Bold.ttf" $dst"res/fonts/ssb.ttf"
- cp $font_src"DejaVuSans-Oblique.ttf" $dst"res/fonts/ssi.ttf"
- cp $font_src"DejaVuSans-BoldOblique.ttf" $dst"res/fonts/ssib.ttf"
- cp $font_src"DejaVuSansMono.ttf" $dst"res/fonts/mono.ttf"
- cp $font_src"DejaVuSansMono-Bold.ttf" $dst"res/fonts/monob.ttf"
- cp $font_src"DejaVuSansMono-Oblique.ttf" $dst"res/fonts/cursive.ttf"
- cp $font_src"DejaVuSerif.ttf" $dst"res/fonts/s.ttf"
- cp $font_src"DejaVuSerif-Bold.ttf" $dst"res/fonts/sb.ttf"
- cp $font_src"DejaVuSerifCondensed-Bold.ttf" $dst"res/fonts/fantasy.ttf"
-fi
-
-#create an simple startup script:
-if [ "$framebuffer" = "1" ]
-then
-echo "NETSURFRES=./res/
-export NETSURFRES
-./nsfb.prg -v file:///f/" > $dst"ns.sh"
-chmod +x $dst"ns.sh"
-fi
-
-echo "
-atari_screen_driver:vdi
-# select font driver, available values: freetype, internal
-atari_font_driver:freetype
-atari_transparency:1
-atari_realtime_move:1
-# uncomment the following to show source within editor:
-#atari_editor:/path/to/editor.app
-
-# url to start netsurf with ( and new windows )
-homepage_url:file://./res/blank
-
-#configure css font settings:
-font_size:130
-font_min_size:120
-
-# 20 MB Cache as default:
-memory_cache_size:2048512
-
-# this actually hides advertisements, it still generates network traffic:
-block_advertisements:0
-
-#network configuration:
-send_referer:1
-http_proxy:0
-http_proxy_host:
-http_proxy_port:8123
-http_proxy_auth:0
-http_proxy_auth_user:
-http_proxy_auth_pass:
-suppress_curl_debug:1
-
-# animation configuration ( GIF ):
-minimum_gif_delay:50
-animate_images:1
-
-foreground_images:1
-background_images:1
-
-
-# path configuration
-ca_bundle:./res/cabundle
-ca_path:./res/certs
-cookie_file:./res/cookies
-url_file:./res/url.db
-tree_icons_path:./res/icons
-downloads_path:./download
-hotlist_file:./res/hotlist
-
-# enable reflow for interactive content and during fetch:
-incremental_reflow:1
-# reformat time during fetch:
-min_reflow_period:2500
-core_select_menu:1
-max_fetchers:3
-max_fetchers_per_host:2
-max_cached_fetch_handles:5
-
-# allow target=_blank (link opens in new window):
-target_blank:1
-
-# options nowhere used currently follow:
-
-# suppres images when exporting pages (to PDF):
-# suppress_images:0
-# turn off backgrounds for printed content:
-#remove_backgrounds:0
-# smooth resizing:
-#render_resample:1
-# enable loosening for printed content:
-#enable_loosening:1
-# configure disc cache ( currently not implemented )
-#option_disc_cache_age:28
-#configure urldb (url search):
-#expire_url:28
-#hover_urls:1
-" > $dst"Choices"
-
-cd $dst
-tar cvf - ./* | gzip -9 -c > netsurf.tar.gz
-zip netsurf.zip -9 -r ./ -x netsurf.tar.gz
-
-echo
-exit 0
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-812-g81f7cf5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/81f7cf5a75908b25d46e7...
...commit http://git.netsurf-browser.org/netsurf.git/commit/81f7cf5a75908b25d46e7b0...
...tree http://git.netsurf-browser.org/netsurf.git/tree/81f7cf5a75908b25d46e7b07f...
The branch, master has been updated
via 81f7cf5a75908b25d46e7b07fb989ba00c6e9a43 (commit)
from 7395aa14ff0f0364bd3ef0f14933daf06a40937f (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/commit/?id=81f7cf5a75908b25d46...
commit 81f7cf5a75908b25d46e7b07fb989ba00c6e9a43
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Prepared TODO's for NetSurf 3.1
diff --git a/atari/doc/todo.txt b/atari/doc/todo.txt
index a42ae61..49f8e65 100755
--- a/atari/doc/todo.txt
+++ b/atari/doc/todo.txt
@@ -1,31 +1,18 @@
-TODO's (no priority order)
+TODO's (no priority order) for NetSurf 3.1 - 4.0
- - Optimize remove / redraw of caret, use pixbuffer instead?
- Optimize drawing of bitmaps on Low-Memory machines
- Restore the Palette when Windows get's the Focus
-> only needed for <= 256 colors
- Make drawing of tiled bitmaps optional ( they are slooow )
-> already optimized, still needed?
- - only copy visible rects when copying screen rects ( during scroll ).
- - Make context menu more stable, Bug lurking within core?
- - Implement TreeView History
- - Implement TreeView SSL Dialog
- - Implement Native Select Menu
- - Implement offscreen plotter
- - Implement Options Dialog
- - Implement SystemColors
- - Replace RSC strings with string from messages file.
- - Optimize Offscreen Plotter: Save inactive framebuffers to disk?
- - Ensure that a font-face is set to the default font when it couldn't be loaded.
- - Loose focus for browser / url widget etc. when changing focus
- ( at best, implement callback for this...)
+ - Make context menu more stable (grab all available context data at popup display)
+ - Implement SystemColor Choices dialog
+ - Add at least one offscreen plotter implementation
+ - Fix utf8 to atari character conversion (legacy VDI text plotter
+ must be able to handle the text argument characters correctly)
+ - Add URL history when typing URL's into url textarea
- Have browser_window specific cursor, window specifc cursor
- When minimized (not iconyfied) NetSurf doesn't recognize that.
- - Tabs? ( several tab-favicons when iconyfied?)
- - improve mouse tracking
- - fix this:
-path2url in: ./res/icons/dir.png
-path2url out: file:///./res/icons/dir.png
-url2path in: file:///./res/icons/dir.png
- - loesung fuer kompletten tree icons path finden
+ - Implement Tabs (up to 4 tab favicons when iconyfied)
+ - merge treeview and gui_window handling
-----------------------------------------------------------------------
Summary of changes:
atari/doc/todo.txt | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/atari/doc/todo.txt b/atari/doc/todo.txt
index a42ae61..49f8e65 100755
--- a/atari/doc/todo.txt
+++ b/atari/doc/todo.txt
@@ -1,31 +1,18 @@
-TODO's (no priority order)
+TODO's (no priority order) for NetSurf 3.1 - 4.0
- - Optimize remove / redraw of caret, use pixbuffer instead?
- Optimize drawing of bitmaps on Low-Memory machines
- Restore the Palette when Windows get's the Focus
-> only needed for <= 256 colors
- Make drawing of tiled bitmaps optional ( they are slooow )
-> already optimized, still needed?
- - only copy visible rects when copying screen rects ( during scroll ).
- - Make context menu more stable, Bug lurking within core?
- - Implement TreeView History
- - Implement TreeView SSL Dialog
- - Implement Native Select Menu
- - Implement offscreen plotter
- - Implement Options Dialog
- - Implement SystemColors
- - Replace RSC strings with string from messages file.
- - Optimize Offscreen Plotter: Save inactive framebuffers to disk?
- - Ensure that a font-face is set to the default font when it couldn't be loaded.
- - Loose focus for browser / url widget etc. when changing focus
- ( at best, implement callback for this...)
+ - Make context menu more stable (grab all available context data at popup display)
+ - Implement SystemColor Choices dialog
+ - Add at least one offscreen plotter implementation
+ - Fix utf8 to atari character conversion (legacy VDI text plotter
+ must be able to handle the text argument characters correctly)
+ - Add URL history when typing URL's into url textarea
- Have browser_window specific cursor, window specifc cursor
- When minimized (not iconyfied) NetSurf doesn't recognize that.
- - Tabs? ( several tab-favicons when iconyfied?)
- - improve mouse tracking
- - fix this:
-path2url in: ./res/icons/dir.png
-path2url out: file:///./res/icons/dir.png
-url2path in: file:///./res/icons/dir.png
- - loesung fuer kompletten tree icons path finden
+ - Implement Tabs (up to 4 tab favicons when iconyfied)
+ - merge treeview and gui_window handling
--
NetSurf Browser
9 years, 1 month
- 1
- 0