From 3c5317cf54aebe40e8aaa2a6e107579c33184449 Mon Sep 17 00:00:00 2001 From: François Revol Date: Tue, 31 Dec 2013 15:13:36 +0100 Subject: beos: Fix embedded files in resources - drop the remaining hardcoded files in rdef file - add favicon.png - remove en/ symlink - add real folders with symlinks for translated files like GTK Note the Messages files are also included although the current code is not able to load them from the resources. - add symlinks for html files to the en/ version (TODO: try to remap automatically) --- beos/Makefile.target | 6 ++++-- beos/res.rdef | 5 +---- beos/res/credits.html | 1 + beos/res/de/Messages | 1 + beos/res/de/welcome.html | 1 + beos/res/en | 1 - beos/res/en/Messages | 1 + beos/res/en/credits.html | 1 + beos/res/en/licence.html | 1 + beos/res/en/welcome.html | 1 + beos/res/favicon.png | 1 + beos/res/fr/Messages | 1 + beos/res/it/Messages | 1 + beos/res/it/credits.html | 1 + beos/res/it/licence.html | 1 + beos/res/it/welcome.html | 1 + beos/res/ja/welcome.html | 1 + beos/res/licence.html | 1 + beos/res/nl/Messages | 1 + beos/res/welcome.html | 1 + 20 files changed, 22 insertions(+), 7 deletions(-) create mode 120000 beos/res/credits.html create mode 120000 beos/res/de/Messages create mode 120000 beos/res/de/welcome.html delete mode 120000 beos/res/en create mode 120000 beos/res/en/Messages create mode 120000 beos/res/en/credits.html create mode 120000 beos/res/en/licence.html create mode 120000 beos/res/en/welcome.html create mode 120000 beos/res/favicon.png create mode 120000 beos/res/fr/Messages create mode 120000 beos/res/it/Messages create mode 120000 beos/res/it/credits.html create mode 120000 beos/res/it/licence.html create mode 120000 beos/res/it/welcome.html create mode 120000 beos/res/ja/welcome.html create mode 120000 beos/res/licence.html create mode 120000 beos/res/nl/Messages create mode 120000 beos/res/welcome.html (limited to 'beos') diff --git a/beos/Makefile.target b/beos/Makefile.target index 847850bb9..ed7532dc2 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -99,9 +99,11 @@ RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS))) RDEP_BEOS := \ adblock.css beosdefault.css default.css internal.css quirks.css \ - netsurf.png ca-bundle.txt + netsurf.png favicon.png ca-bundle.txt \ + credits.html licence.html welcome.html RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \ - $(wildcard beos/res/icons/*.png) \ + $(wildcard beos/res/icons/*.png) \ + $(wildcard beos/res/??/*) \ $(wildcard beos/res/throbber/throbber*.png) diff --git a/beos/res.rdef b/beos/res.rdef index 97dc59dd7..07012356c 100644 --- a/beos/res.rdef +++ b/beos/res.rdef @@ -18,10 +18,7 @@ #include "res.h" -/* files exported as resource:// via rsrc:// mapping */ -resource(500, "credits.html") #'data' import "res/en/credits.html,faf"; -resource(501, "licence.html") #'data' import "res/en/licence.html,faf"; -resource(502, "welcome.html") #'data' import "res/en/welcome.html,faf"; +/* files exported as resource: via rsrc:// mapping are added by the makefile */ /* application flags (multiple launch) */ resource(1, "BEOS:APP_FLAGS") (#'APPF') $"01000000"; diff --git a/beos/res/credits.html b/beos/res/credits.html new file mode 120000 index 000000000..ca85d3d27 --- /dev/null +++ b/beos/res/credits.html @@ -0,0 +1 @@ +en/credits.html \ No newline at end of file diff --git a/beos/res/de/Messages b/beos/res/de/Messages new file mode 120000 index 000000000..2f1fc39c3 --- /dev/null +++ b/beos/res/de/Messages @@ -0,0 +1 @@ +../../../!NetSurf/Resources/de/Messages \ No newline at end of file diff --git a/beos/res/de/welcome.html b/beos/res/de/welcome.html new file mode 120000 index 000000000..b2ddfc796 --- /dev/null +++ b/beos/res/de/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/de/welcome.html,faf \ No newline at end of file diff --git a/beos/res/en b/beos/res/en deleted file mode 120000 index d1dfaa9d2..000000000 --- a/beos/res/en +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en \ No newline at end of file diff --git a/beos/res/en/Messages b/beos/res/en/Messages new file mode 120000 index 000000000..72c9eff90 --- /dev/null +++ b/beos/res/en/Messages @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/beos/res/en/credits.html b/beos/res/en/credits.html new file mode 120000 index 000000000..1ba17392b --- /dev/null +++ b/beos/res/en/credits.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/credits.html,faf \ No newline at end of file diff --git a/beos/res/en/licence.html b/beos/res/en/licence.html new file mode 120000 index 000000000..147dd6db2 --- /dev/null +++ b/beos/res/en/licence.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/licence.html,faf \ No newline at end of file diff --git a/beos/res/en/welcome.html b/beos/res/en/welcome.html new file mode 120000 index 000000000..28362130a --- /dev/null +++ b/beos/res/en/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file diff --git a/beos/res/favicon.png b/beos/res/favicon.png new file mode 120000 index 000000000..d968c3827 --- /dev/null +++ b/beos/res/favicon.png @@ -0,0 +1 @@ +../../gtk/res/favicon.png \ No newline at end of file diff --git a/beos/res/fr/Messages b/beos/res/fr/Messages new file mode 120000 index 000000000..a42cf08f4 --- /dev/null +++ b/beos/res/fr/Messages @@ -0,0 +1 @@ +../../../!NetSurf/Resources/fr/Messages \ No newline at end of file diff --git a/beos/res/it/Messages b/beos/res/it/Messages new file mode 120000 index 000000000..d4c5c2956 --- /dev/null +++ b/beos/res/it/Messages @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/Messages \ No newline at end of file diff --git a/beos/res/it/credits.html b/beos/res/it/credits.html new file mode 120000 index 000000000..6e1e15ed5 --- /dev/null +++ b/beos/res/it/credits.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/credits.html,faf \ No newline at end of file diff --git a/beos/res/it/licence.html b/beos/res/it/licence.html new file mode 120000 index 000000000..3a7c056b6 --- /dev/null +++ b/beos/res/it/licence.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/licence.html,faf \ No newline at end of file diff --git a/beos/res/it/welcome.html b/beos/res/it/welcome.html new file mode 120000 index 000000000..dea1e839c --- /dev/null +++ b/beos/res/it/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/welcome.html,faf \ No newline at end of file diff --git a/beos/res/ja/welcome.html b/beos/res/ja/welcome.html new file mode 120000 index 000000000..827796f02 --- /dev/null +++ b/beos/res/ja/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/ja/welcome.html,faf \ No newline at end of file diff --git a/beos/res/licence.html b/beos/res/licence.html new file mode 120000 index 000000000..86f8c54bf --- /dev/null +++ b/beos/res/licence.html @@ -0,0 +1 @@ +en/licence.html \ No newline at end of file diff --git a/beos/res/nl/Messages b/beos/res/nl/Messages new file mode 120000 index 000000000..d484ebd29 --- /dev/null +++ b/beos/res/nl/Messages @@ -0,0 +1 @@ +../../../!NetSurf/Resources/nl/Messages \ No newline at end of file diff --git a/beos/res/welcome.html b/beos/res/welcome.html new file mode 120000 index 000000000..1abdc5e8a --- /dev/null +++ b/beos/res/welcome.html @@ -0,0 +1 @@ +en/welcome.html \ No newline at end of file -- cgit v1.2.3