From de806db28e91e0c216200eef130d4672e29efb01 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 22 Apr 2018 11:15:23 +0100 Subject: [PATCH] Move !NetSurf into frontends/riscos and fix up --- !NetSurf/Resources/AdBlock,f79 | 1 - !NetSurf/Resources/CSS,f79 | 1 - !NetSurf/Resources/Icons | 1 - !NetSurf/Resources/Quirks,f79 | 1 - !NetSurf/Resources/ca-bundle | 1 - !NetSurf/Resources/de/welcome.html,faf | 1 - !NetSurf/Resources/en/credits.html,faf | 1 - !NetSurf/Resources/en/licence.html,faf | 1 - !NetSurf/Resources/en/maps.html,faf | 1 - !NetSurf/Resources/en/welcome.html,faf | 1 - !NetSurf/Resources/internal.css,f79 | 1 - !NetSurf/Resources/it/credits.html,faf | 1 - !NetSurf/Resources/it/licence.html,faf | 1 - !NetSurf/Resources/it/welcome.html,faf | 1 - !NetSurf/Resources/ja/welcome.html,faf | 1 - !NetSurf/Resources/netsurf.png,b60 | 1 - !NetSurf/Resources/nl/credits.html,faf | 1 - !NetSurf/Resources/nl/licence.html,faf | 1 - !NetSurf/Resources/nl/welcome.html,faf | 1 - .gitignore | 24 ++++++++-------- docs/PACKAGING-GTK | 3 +- frontends/riscos/Makefile | 26 +++++++++--------- .../riscos/appdir}/!Boot,feb | 0 .../riscos/appdir}/!Sprites,ff9 | Bin .../riscos/appdir}/!Sprites22,ff9 | Bin .../riscos/appdir}/5Sprites,ff9 | Bin .../riscos/appdir}/5Sprites11,ff9 | Bin .../riscos/appdir}/5Sprites22,ff9 | Bin .../riscos/appdir}/ASprites,ff9 | Bin .../riscos/appdir}/ASprites11,ff9 | Bin .../riscos/appdir}/ASprites22,ff9 | Bin .../riscos/appdir}/ChkSprites,ffb | Bin .../riscos/appdir}/Docs/online,b60 | Bin .../riscos/appdir}/FixFonts,ffb | 0 .../riscos/appdir}/KickNS,ffb | Bin .../riscos/appdir}/OpenChoices,feb | 0 .../riscos/appdir}/OpenHelp,ffb | Bin .../riscos/appdir}/OpenScrap,feb | 0 frontends/riscos/appdir/Resources/AdBlock,f79 | 1 + .../riscos/appdir}/Resources/Aletheia,ffd | Bin frontends/riscos/appdir/Resources/CSS,f79 | 1 + .../appdir}/Resources/Fonts/NSSymbol/Encoding | 0 .../Resources/Fonts/NSSymbol/IntMetrics,ff6 | Bin .../Resources/Fonts/NSSymbol/Outlines,ff6 | Bin frontends/riscos/appdir/Resources/Icons | 1 + .../riscos/appdir}/Resources/Image,ff9 | Bin .../riscos/appdir}/Resources/LangNames | 0 frontends/riscos/appdir/Resources/Quirks,f79 | 1 + .../riscos/appdir}/Resources/SearchEngines | 0 .../riscos/appdir}/Resources/Sprites,ff9 | Bin frontends/riscos/appdir/Resources/ca-bundle | 1 + frontends/riscos/appdir/Resources/de/Messages | 1 + .../appdir/Resources/de/welcome.html,faf | 1 + .../riscos/appdir}/Resources/en/!Help | 0 frontends/riscos/appdir/Resources/en/Messages | 1 + .../appdir/Resources/en/credits.html,faf | 1 + .../appdir/Resources/en/licence.html,faf | 1 + .../riscos/appdir/Resources/en/maps.html,faf | 1 + .../appdir/Resources/en/welcome.html,faf | 1 + frontends/riscos/appdir/Resources/fr/Messages | 1 + .../riscos/appdir/Resources/internal.css,f79 | 1 + frontends/riscos/appdir/Resources/it/Messages | 1 + .../appdir/Resources/it/credits.html,faf | 1 + .../appdir/Resources/it/licence.html,faf | 1 + .../appdir/Resources/it/welcome.html,faf | 1 + .../appdir/Resources/ja/welcome.html,faf | 1 + .../riscos/appdir/Resources/netsurf.png,b60 | 1 + .../riscos/appdir}/Resources/nl/!Help | 0 frontends/riscos/appdir/Resources/nl/Messages | 1 + .../appdir/Resources/nl/credits.html,faf | 1 + .../appdir/Resources/nl/licence.html,faf | 1 + .../appdir/Resources/nl/welcome.html,faf | 1 + 72 files changed, 50 insertions(+), 46 deletions(-) delete mode 120000 !NetSurf/Resources/AdBlock,f79 delete mode 120000 !NetSurf/Resources/CSS,f79 delete mode 120000 !NetSurf/Resources/Icons delete mode 120000 !NetSurf/Resources/Quirks,f79 delete mode 120000 !NetSurf/Resources/ca-bundle delete mode 120000 !NetSurf/Resources/de/welcome.html,faf delete mode 120000 !NetSurf/Resources/en/credits.html,faf delete mode 120000 !NetSurf/Resources/en/licence.html,faf delete mode 120000 !NetSurf/Resources/en/maps.html,faf delete mode 120000 !NetSurf/Resources/en/welcome.html,faf delete mode 120000 !NetSurf/Resources/internal.css,f79 delete mode 120000 !NetSurf/Resources/it/credits.html,faf delete mode 120000 !NetSurf/Resources/it/licence.html,faf delete mode 120000 !NetSurf/Resources/it/welcome.html,faf delete mode 120000 !NetSurf/Resources/ja/welcome.html,faf delete mode 120000 !NetSurf/Resources/netsurf.png,b60 delete mode 120000 !NetSurf/Resources/nl/credits.html,faf delete mode 120000 !NetSurf/Resources/nl/licence.html,faf delete mode 120000 !NetSurf/Resources/nl/welcome.html,faf rename {!NetSurf => frontends/riscos/appdir}/!Boot,feb (100%) rename {!NetSurf => frontends/riscos/appdir}/!Sprites,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/!Sprites22,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/5Sprites,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/5Sprites11,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/5Sprites22,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/ASprites,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/ASprites11,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/ASprites22,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/ChkSprites,ffb (100%) rename {!NetSurf => frontends/riscos/appdir}/Docs/online,b60 (100%) rename {!NetSurf => frontends/riscos/appdir}/FixFonts,ffb (100%) rename {!NetSurf => frontends/riscos/appdir}/KickNS,ffb (100%) rename {!NetSurf => frontends/riscos/appdir}/OpenChoices,feb (100%) rename {!NetSurf => frontends/riscos/appdir}/OpenHelp,ffb (100%) rename {!NetSurf => frontends/riscos/appdir}/OpenScrap,feb (100%) create mode 120000 frontends/riscos/appdir/Resources/AdBlock,f79 rename {!NetSurf => frontends/riscos/appdir}/Resources/Aletheia,ffd (100%) create mode 120000 frontends/riscos/appdir/Resources/CSS,f79 rename {!NetSurf => frontends/riscos/appdir}/Resources/Fonts/NSSymbol/Encoding (100%) rename {!NetSurf => frontends/riscos/appdir}/Resources/Fonts/NSSymbol/IntMetrics,ff6 (100%) rename {!NetSurf => frontends/riscos/appdir}/Resources/Fonts/NSSymbol/Outlines,ff6 (100%) create mode 120000 frontends/riscos/appdir/Resources/Icons rename {!NetSurf => frontends/riscos/appdir}/Resources/Image,ff9 (100%) rename {!NetSurf => frontends/riscos/appdir}/Resources/LangNames (100%) create mode 120000 frontends/riscos/appdir/Resources/Quirks,f79 rename {!NetSurf => frontends/riscos/appdir}/Resources/SearchEngines (100%) rename {!NetSurf => frontends/riscos/appdir}/Resources/Sprites,ff9 (100%) create mode 120000 frontends/riscos/appdir/Resources/ca-bundle create mode 120000 frontends/riscos/appdir/Resources/de/Messages create mode 120000 frontends/riscos/appdir/Resources/de/welcome.html,faf rename {!NetSurf => frontends/riscos/appdir}/Resources/en/!Help (100%) create mode 120000 frontends/riscos/appdir/Resources/en/Messages create mode 120000 frontends/riscos/appdir/Resources/en/credits.html,faf create mode 120000 frontends/riscos/appdir/Resources/en/licence.html,faf create mode 120000 frontends/riscos/appdir/Resources/en/maps.html,faf create mode 120000 frontends/riscos/appdir/Resources/en/welcome.html,faf create mode 120000 frontends/riscos/appdir/Resources/fr/Messages create mode 120000 frontends/riscos/appdir/Resources/internal.css,f79 create mode 120000 frontends/riscos/appdir/Resources/it/Messages create mode 120000 frontends/riscos/appdir/Resources/it/credits.html,faf create mode 120000 frontends/riscos/appdir/Resources/it/licence.html,faf create mode 120000 frontends/riscos/appdir/Resources/it/welcome.html,faf create mode 120000 frontends/riscos/appdir/Resources/ja/welcome.html,faf create mode 120000 frontends/riscos/appdir/Resources/netsurf.png,b60 rename {!NetSurf => frontends/riscos/appdir}/Resources/nl/!Help (100%) create mode 120000 frontends/riscos/appdir/Resources/nl/Messages create mode 120000 frontends/riscos/appdir/Resources/nl/credits.html,faf create mode 120000 frontends/riscos/appdir/Resources/nl/licence.html,faf create mode 120000 frontends/riscos/appdir/Resources/nl/welcome.html,faf diff --git a/!NetSurf/Resources/AdBlock,f79 b/!NetSurf/Resources/AdBlock,f79 deleted file mode 120000 index 9776ae649..000000000 --- a/!NetSurf/Resources/AdBlock,f79 +++ /dev/null @@ -1 +0,0 @@ -../../resources/adblock.css \ No newline at end of file diff --git a/!NetSurf/Resources/CSS,f79 b/!NetSurf/Resources/CSS,f79 deleted file mode 120000 index 4014c5606..000000000 --- a/!NetSurf/Resources/CSS,f79 +++ /dev/null @@ -1 +0,0 @@ -../../resources/default.css \ No newline at end of file diff --git a/!NetSurf/Resources/Icons b/!NetSurf/Resources/Icons deleted file mode 120000 index 2fd9ce079..000000000 --- a/!NetSurf/Resources/Icons +++ /dev/null @@ -1 +0,0 @@ -../../resources/icons \ No newline at end of file diff --git a/!NetSurf/Resources/Quirks,f79 b/!NetSurf/Resources/Quirks,f79 deleted file mode 120000 index 6d55ca22d..000000000 --- a/!NetSurf/Resources/Quirks,f79 +++ /dev/null @@ -1 +0,0 @@ -../../resources/quirks.css \ No newline at end of file diff --git a/!NetSurf/Resources/ca-bundle b/!NetSurf/Resources/ca-bundle deleted file mode 120000 index a5f177704..000000000 --- a/!NetSurf/Resources/ca-bundle +++ /dev/null @@ -1 +0,0 @@ -../../resources/ca-bundle \ No newline at end of file diff --git a/!NetSurf/Resources/de/welcome.html,faf b/!NetSurf/Resources/de/welcome.html,faf deleted file mode 120000 index 81ebd1d07..000000000 --- a/!NetSurf/Resources/de/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/de/welcome.html \ No newline at end of file diff --git a/!NetSurf/Resources/en/credits.html,faf b/!NetSurf/Resources/en/credits.html,faf deleted file mode 120000 index b43a1a06c..000000000 --- a/!NetSurf/Resources/en/credits.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/en/credits.html \ No newline at end of file diff --git a/!NetSurf/Resources/en/licence.html,faf b/!NetSurf/Resources/en/licence.html,faf deleted file mode 120000 index c0c1e6630..000000000 --- a/!NetSurf/Resources/en/licence.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/en/licence.html \ No newline at end of file diff --git a/!NetSurf/Resources/en/maps.html,faf b/!NetSurf/Resources/en/maps.html,faf deleted file mode 120000 index 05bcdc42e..000000000 --- a/!NetSurf/Resources/en/maps.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/en/maps.html \ No newline at end of file diff --git a/!NetSurf/Resources/en/welcome.html,faf b/!NetSurf/Resources/en/welcome.html,faf deleted file mode 120000 index d5220f90a..000000000 --- a/!NetSurf/Resources/en/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/en/welcome.html \ No newline at end of file diff --git a/!NetSurf/Resources/internal.css,f79 b/!NetSurf/Resources/internal.css,f79 deleted file mode 120000 index d0f22cf99..000000000 --- a/!NetSurf/Resources/internal.css,f79 +++ /dev/null @@ -1 +0,0 @@ -../../resources/internal.css \ No newline at end of file diff --git a/!NetSurf/Resources/it/credits.html,faf b/!NetSurf/Resources/it/credits.html,faf deleted file mode 120000 index ff06c25fd..000000000 --- a/!NetSurf/Resources/it/credits.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/it/credits.html \ No newline at end of file diff --git a/!NetSurf/Resources/it/licence.html,faf b/!NetSurf/Resources/it/licence.html,faf deleted file mode 120000 index e642cacdf..000000000 --- a/!NetSurf/Resources/it/licence.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/it/licence.html \ No newline at end of file diff --git a/!NetSurf/Resources/it/welcome.html,faf b/!NetSurf/Resources/it/welcome.html,faf deleted file mode 120000 index 709c73409..000000000 --- a/!NetSurf/Resources/it/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/it/welcome.html \ No newline at end of file diff --git a/!NetSurf/Resources/ja/welcome.html,faf b/!NetSurf/Resources/ja/welcome.html,faf deleted file mode 120000 index 7e41c2835..000000000 --- a/!NetSurf/Resources/ja/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/ja/welcome.html \ No newline at end of file diff --git a/!NetSurf/Resources/netsurf.png,b60 b/!NetSurf/Resources/netsurf.png,b60 deleted file mode 120000 index 1937a584f..000000000 --- a/!NetSurf/Resources/netsurf.png,b60 +++ /dev/null @@ -1 +0,0 @@ -../../resources/netsurf.png \ No newline at end of file diff --git a/!NetSurf/Resources/nl/credits.html,faf b/!NetSurf/Resources/nl/credits.html,faf deleted file mode 120000 index 144d113f1..000000000 --- a/!NetSurf/Resources/nl/credits.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/nl/credits.html \ No newline at end of file diff --git a/!NetSurf/Resources/nl/licence.html,faf b/!NetSurf/Resources/nl/licence.html,faf deleted file mode 120000 index 17e160c32..000000000 --- a/!NetSurf/Resources/nl/licence.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/nl/licence.html \ No newline at end of file diff --git a/!NetSurf/Resources/nl/welcome.html,faf b/!NetSurf/Resources/nl/welcome.html,faf deleted file mode 120000 index c847326a1..000000000 --- a/!NetSurf/Resources/nl/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../resources/nl/welcome.html \ No newline at end of file diff --git a/.gitignore b/.gitignore index 35de191c2..bb10ba503 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,16 @@ *~ -\!NetSurf/!Run,feb -\!NetSurf/!RunImage,ff8 -\!NetSurf/!Help,feb -\!NetSurf/Resources/en/Templates,fec -\!NetSurf/Resources/en/Messages -\!NetSurf/Resources/fr/Templates,fec -\!NetSurf/Resources/fr/Messages -\!NetSurf/Resources/de/Templates,fec -\!NetSurf/Resources/de/Messages -\!NetSurf/Resources/nl/Templates,fec -\!NetSurf/Resources/nl/Messages -\!NetSurf/Resources/it/Messages +frontends/riscos/appdir/!Run,feb +frontends/riscos/appdir/!RunImage,ff8 +frontends/riscos/appdir/!Help,feb +frontends/riscos/appdir/Resources/en/Templates,fec +frontends/riscos/appdir/Resources/fr/Templates,fec +frontends/riscos/appdir/Resources/de/Templates,fec +frontends/riscos/appdir/Resources/nl/Templates,fec +resources/en/Messages +resources/fr/Messages +resources/de/Messages +resources/nl/Messages +resources/it/Messages frontends/gtk/res/en/Messages frontends/gtk/res/fr/Messages frontends/gtk/res/de/Messages diff --git a/docs/PACKAGING-GTK b/docs/PACKAGING-GTK index 8f675229f..7436f238e 100644 --- a/docs/PACKAGING-GTK +++ b/docs/PACKAGING-GTK @@ -24,8 +24,7 @@ The GTK port of NetSurf requires access to some resources at run time. These are stored in gtk/res/ in the source tree. Some of these files are - symlinks into the !NetSurf directory, which is the application container - for the native RISC OS build. None of the other files from the !NetSurf + symlinks into the top level resources directory. Not all of the files in the directory are required - the symlinks are used only as a way of making checkouts smaller and making sure changes to one set of resources updates the other. diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile index 84a1c93f9..f531b6b5b 100644 --- a/frontends/riscos/Makefile +++ b/frontends/riscos/Makefile @@ -16,7 +16,7 @@ $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile e TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ - !NetSurf/Resources/$(TPL)/Templates$(TPLEXT)) + $(FRONTEND_SOURCE_DIR)/appdir/Resources/$(TPL)/Templates$(TPLEXT)) RESOURCES = $(TPD_RISCOS) @@ -68,16 +68,16 @@ S_FRONTEND := 401login.c assert.c bitmap.c buffer.c configure.c gui.c \ # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) -EXETARGET := !NetSurf/!RunImage$(EXEEXT) +EXETARGET := $(FRONTEND_SOURCE_DIR)/appdir/!RunImage$(EXEEXT) # The filter and target for split messages MESSAGES_FILTER=ro -!NetSurf/!Run$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET) +$(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET) $(VQ)echo " MAKERUN: $@" $(Q)$(MAKERUN) $(EXETARGET) $< $@ -!NetSurf/!Help$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Help +$(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Help $(VQ)echo " CP: $@" $(Q)cp $< $@ @@ -86,16 +86,16 @@ $(DEPROOT)/squeeze.d: $(EXETARGET) $(Q)$(SQUEEZE) -f -v $(EXETARGET) $(Q)$(TOUCH) $@ -POSTEXES += !NetSurf/!Run$(RUNEXT) !NetSurf/!Help$(RUNEXT) $(DEPROOT)/squeeze.d +POSTEXES += $(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT) $(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT) $(DEPROOT)/squeeze.d clean-run: - $(VQ)echo " CLEAN: !NetSurf/!Run$(RUNEXT)" - $(Q) $(RM) !NetSurf/!Run$(RUNEXT) + $(VQ)echo " CLEAN: !Run$(RUNEXT)" + $(Q) $(RM) $(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT) clean-help: - $(VQ)echo " CLEAN: !NetSurf/!Help$(RUNEXT)" - $(Q) $(RM) !NetSurf/!Help$(RUNEXT) + $(VQ)echo " CLEAN: !Help$(RUNEXT)" + $(Q) $(RM) $(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT) CLEANS += clean-run clean-help @@ -109,12 +109,12 @@ TPL_RISCOS := $(addprefix $(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS)) # Template target creation macro define compile_template -!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) +$(FRONTEND_SOURCE_DIR)/appdir/Resources/$(1)/Templates$$(TPLEXT): $(2) $$(VQ)echo "TEMPLATE: $(2)" - $$(Q)$$(MKDIR) -p !NetSurf/Resources/$(1) + $$(Q)$$(MKDIR) -p $(FRONTEND_SOURCE_DIR)/appdir/Resources/$(1) $$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@ -CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT) +CLEAN_TEMPLATES += $(FRONTEND_SOURCE_DIR)/appdir/Resources/$(1)/Templates$$(TPLEXT) endef @@ -142,7 +142,7 @@ package-riscos: netsurf.zip netsurf.zip: $(EXETARGET) $(eval $@_TMPDIR := $(shell mktemp -d)) $(Q) $(RM) $@ - $(Q) rsync --archive --verbose $(CURDIR)/!NetSurf $($@_TMPDIR) + $(Q) cp -rLvp $(FRONTEND_SOURCE_DIR)/appdir $($@_TMPDIR)/!NetSurf $(Q) $(CURDIR)/utils/git-date.sh $(FRONTEND_SOURCE_DIR)/distribution $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!Boot $($@_TMPDIR) $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!System $($@_TMPDIR) diff --git a/!NetSurf/!Boot,feb b/frontends/riscos/appdir/!Boot,feb similarity index 100% rename from !NetSurf/!Boot,feb rename to frontends/riscos/appdir/!Boot,feb diff --git a/!NetSurf/!Sprites,ff9 b/frontends/riscos/appdir/!Sprites,ff9 similarity index 100% rename from !NetSurf/!Sprites,ff9 rename to frontends/riscos/appdir/!Sprites,ff9 diff --git a/!NetSurf/!Sprites22,ff9 b/frontends/riscos/appdir/!Sprites22,ff9 similarity index 100% rename from !NetSurf/!Sprites22,ff9 rename to frontends/riscos/appdir/!Sprites22,ff9 diff --git a/!NetSurf/5Sprites,ff9 b/frontends/riscos/appdir/5Sprites,ff9 similarity index 100% rename from !NetSurf/5Sprites,ff9 rename to frontends/riscos/appdir/5Sprites,ff9 diff --git a/!NetSurf/5Sprites11,ff9 b/frontends/riscos/appdir/5Sprites11,ff9 similarity index 100% rename from !NetSurf/5Sprites11,ff9 rename to frontends/riscos/appdir/5Sprites11,ff9 diff --git a/!NetSurf/5Sprites22,ff9 b/frontends/riscos/appdir/5Sprites22,ff9 similarity index 100% rename from !NetSurf/5Sprites22,ff9 rename to frontends/riscos/appdir/5Sprites22,ff9 diff --git a/!NetSurf/ASprites,ff9 b/frontends/riscos/appdir/ASprites,ff9 similarity index 100% rename from !NetSurf/ASprites,ff9 rename to frontends/riscos/appdir/ASprites,ff9 diff --git a/!NetSurf/ASprites11,ff9 b/frontends/riscos/appdir/ASprites11,ff9 similarity index 100% rename from !NetSurf/ASprites11,ff9 rename to frontends/riscos/appdir/ASprites11,ff9 diff --git a/!NetSurf/ASprites22,ff9 b/frontends/riscos/appdir/ASprites22,ff9 similarity index 100% rename from !NetSurf/ASprites22,ff9 rename to frontends/riscos/appdir/ASprites22,ff9 diff --git a/!NetSurf/ChkSprites,ffb b/frontends/riscos/appdir/ChkSprites,ffb similarity index 100% rename from !NetSurf/ChkSprites,ffb rename to frontends/riscos/appdir/ChkSprites,ffb diff --git a/!NetSurf/Docs/online,b60 b/frontends/riscos/appdir/Docs/online,b60 similarity index 100% rename from !NetSurf/Docs/online,b60 rename to frontends/riscos/appdir/Docs/online,b60 diff --git a/!NetSurf/FixFonts,ffb b/frontends/riscos/appdir/FixFonts,ffb similarity index 100% rename from !NetSurf/FixFonts,ffb rename to frontends/riscos/appdir/FixFonts,ffb diff --git a/!NetSurf/KickNS,ffb b/frontends/riscos/appdir/KickNS,ffb similarity index 100% rename from !NetSurf/KickNS,ffb rename to frontends/riscos/appdir/KickNS,ffb diff --git a/!NetSurf/OpenChoices,feb b/frontends/riscos/appdir/OpenChoices,feb similarity index 100% rename from !NetSurf/OpenChoices,feb rename to frontends/riscos/appdir/OpenChoices,feb diff --git a/!NetSurf/OpenHelp,ffb b/frontends/riscos/appdir/OpenHelp,ffb similarity index 100% rename from !NetSurf/OpenHelp,ffb rename to frontends/riscos/appdir/OpenHelp,ffb diff --git a/!NetSurf/OpenScrap,feb b/frontends/riscos/appdir/OpenScrap,feb similarity index 100% rename from !NetSurf/OpenScrap,feb rename to frontends/riscos/appdir/OpenScrap,feb diff --git a/frontends/riscos/appdir/Resources/AdBlock,f79 b/frontends/riscos/appdir/Resources/AdBlock,f79 new file mode 120000 index 000000000..8f57c43fd --- /dev/null +++ b/frontends/riscos/appdir/Resources/AdBlock,f79 @@ -0,0 +1 @@ +../../../../resources/adblock.css \ No newline at end of file diff --git a/!NetSurf/Resources/Aletheia,ffd b/frontends/riscos/appdir/Resources/Aletheia,ffd similarity index 100% rename from !NetSurf/Resources/Aletheia,ffd rename to frontends/riscos/appdir/Resources/Aletheia,ffd diff --git a/frontends/riscos/appdir/Resources/CSS,f79 b/frontends/riscos/appdir/Resources/CSS,f79 new file mode 120000 index 000000000..3238d9188 --- /dev/null +++ b/frontends/riscos/appdir/Resources/CSS,f79 @@ -0,0 +1 @@ +../../../../resources/default.css \ No newline at end of file diff --git a/!NetSurf/Resources/Fonts/NSSymbol/Encoding b/frontends/riscos/appdir/Resources/Fonts/NSSymbol/Encoding similarity index 100% rename from !NetSurf/Resources/Fonts/NSSymbol/Encoding rename to frontends/riscos/appdir/Resources/Fonts/NSSymbol/Encoding diff --git a/!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6 b/frontends/riscos/appdir/Resources/Fonts/NSSymbol/IntMetrics,ff6 similarity index 100% rename from !NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6 rename to frontends/riscos/appdir/Resources/Fonts/NSSymbol/IntMetrics,ff6 diff --git a/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6 b/frontends/riscos/appdir/Resources/Fonts/NSSymbol/Outlines,ff6 similarity index 100% rename from !NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6 rename to frontends/riscos/appdir/Resources/Fonts/NSSymbol/Outlines,ff6 diff --git a/frontends/riscos/appdir/Resources/Icons b/frontends/riscos/appdir/Resources/Icons new file mode 120000 index 000000000..6820377bb --- /dev/null +++ b/frontends/riscos/appdir/Resources/Icons @@ -0,0 +1 @@ +../../../../resources/icons \ No newline at end of file diff --git a/!NetSurf/Resources/Image,ff9 b/frontends/riscos/appdir/Resources/Image,ff9 similarity index 100% rename from !NetSurf/Resources/Image,ff9 rename to frontends/riscos/appdir/Resources/Image,ff9 diff --git a/!NetSurf/Resources/LangNames b/frontends/riscos/appdir/Resources/LangNames similarity index 100% rename from !NetSurf/Resources/LangNames rename to frontends/riscos/appdir/Resources/LangNames diff --git a/frontends/riscos/appdir/Resources/Quirks,f79 b/frontends/riscos/appdir/Resources/Quirks,f79 new file mode 120000 index 000000000..995fafc61 --- /dev/null +++ b/frontends/riscos/appdir/Resources/Quirks,f79 @@ -0,0 +1 @@ +../../../../resources/quirks.css \ No newline at end of file diff --git a/!NetSurf/Resources/SearchEngines b/frontends/riscos/appdir/Resources/SearchEngines similarity index 100% rename from !NetSurf/Resources/SearchEngines rename to frontends/riscos/appdir/Resources/SearchEngines diff --git a/!NetSurf/Resources/Sprites,ff9 b/frontends/riscos/appdir/Resources/Sprites,ff9 similarity index 100% rename from !NetSurf/Resources/Sprites,ff9 rename to frontends/riscos/appdir/Resources/Sprites,ff9 diff --git a/frontends/riscos/appdir/Resources/ca-bundle b/frontends/riscos/appdir/Resources/ca-bundle new file mode 120000 index 000000000..2d99c7508 --- /dev/null +++ b/frontends/riscos/appdir/Resources/ca-bundle @@ -0,0 +1 @@ +../../../../resources/ca-bundle \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/de/Messages b/frontends/riscos/appdir/Resources/de/Messages new file mode 120000 index 000000000..aa4060685 --- /dev/null +++ b/frontends/riscos/appdir/Resources/de/Messages @@ -0,0 +1 @@ +../../../../../resources/de/Messages \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/de/welcome.html,faf b/frontends/riscos/appdir/Resources/de/welcome.html,faf new file mode 120000 index 000000000..d3cfb115d --- /dev/null +++ b/frontends/riscos/appdir/Resources/de/welcome.html,faf @@ -0,0 +1 @@ +../../../../../resources/de/welcome.html \ No newline at end of file diff --git a/!NetSurf/Resources/en/!Help b/frontends/riscos/appdir/Resources/en/!Help similarity index 100% rename from !NetSurf/Resources/en/!Help rename to frontends/riscos/appdir/Resources/en/!Help diff --git a/frontends/riscos/appdir/Resources/en/Messages b/frontends/riscos/appdir/Resources/en/Messages new file mode 120000 index 000000000..56c2ae237 --- /dev/null +++ b/frontends/riscos/appdir/Resources/en/Messages @@ -0,0 +1 @@ +../../../../../resources/en/Messages \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/en/credits.html,faf b/frontends/riscos/appdir/Resources/en/credits.html,faf new file mode 120000 index 000000000..7999c6c56 --- /dev/null +++ b/frontends/riscos/appdir/Resources/en/credits.html,faf @@ -0,0 +1 @@ +../../../../../resources/en/credits.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/en/licence.html,faf b/frontends/riscos/appdir/Resources/en/licence.html,faf new file mode 120000 index 000000000..70371ada8 --- /dev/null +++ b/frontends/riscos/appdir/Resources/en/licence.html,faf @@ -0,0 +1 @@ +../../../../../resources/en/licence.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/en/maps.html,faf b/frontends/riscos/appdir/Resources/en/maps.html,faf new file mode 120000 index 000000000..4ae4f6c42 --- /dev/null +++ b/frontends/riscos/appdir/Resources/en/maps.html,faf @@ -0,0 +1 @@ +../../../../../resources/en/maps.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/en/welcome.html,faf b/frontends/riscos/appdir/Resources/en/welcome.html,faf new file mode 120000 index 000000000..71020bfe8 --- /dev/null +++ b/frontends/riscos/appdir/Resources/en/welcome.html,faf @@ -0,0 +1 @@ +../../../../../resources/en/welcome.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/fr/Messages b/frontends/riscos/appdir/Resources/fr/Messages new file mode 120000 index 000000000..4c321aefd --- /dev/null +++ b/frontends/riscos/appdir/Resources/fr/Messages @@ -0,0 +1 @@ +../../../../../resources/fr/Messages \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/internal.css,f79 b/frontends/riscos/appdir/Resources/internal.css,f79 new file mode 120000 index 000000000..c807a4d3d --- /dev/null +++ b/frontends/riscos/appdir/Resources/internal.css,f79 @@ -0,0 +1 @@ +../../../../resources/internal.css \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/it/Messages b/frontends/riscos/appdir/Resources/it/Messages new file mode 120000 index 000000000..7dc2ae2b1 --- /dev/null +++ b/frontends/riscos/appdir/Resources/it/Messages @@ -0,0 +1 @@ +../../../../../resources/it/Messages \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/it/credits.html,faf b/frontends/riscos/appdir/Resources/it/credits.html,faf new file mode 120000 index 000000000..e0bd9a23f --- /dev/null +++ b/frontends/riscos/appdir/Resources/it/credits.html,faf @@ -0,0 +1 @@ +../../../../../resources/it/credits.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/it/licence.html,faf b/frontends/riscos/appdir/Resources/it/licence.html,faf new file mode 120000 index 000000000..7e8c83571 --- /dev/null +++ b/frontends/riscos/appdir/Resources/it/licence.html,faf @@ -0,0 +1 @@ +../../../../../resources/it/licence.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/it/welcome.html,faf b/frontends/riscos/appdir/Resources/it/welcome.html,faf new file mode 120000 index 000000000..6e24135ff --- /dev/null +++ b/frontends/riscos/appdir/Resources/it/welcome.html,faf @@ -0,0 +1 @@ +../../../../../resources/it/welcome.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/frontends/riscos/appdir/Resources/ja/welcome.html,faf new file mode 120000 index 000000000..1dfdbd7ea --- /dev/null +++ b/frontends/riscos/appdir/Resources/ja/welcome.html,faf @@ -0,0 +1 @@ +../../../../../resources/ja/welcome.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/netsurf.png,b60 b/frontends/riscos/appdir/Resources/netsurf.png,b60 new file mode 120000 index 000000000..e7fa4cb87 --- /dev/null +++ b/frontends/riscos/appdir/Resources/netsurf.png,b60 @@ -0,0 +1 @@ +../../../../resources/netsurf.png \ No newline at end of file diff --git a/!NetSurf/Resources/nl/!Help b/frontends/riscos/appdir/Resources/nl/!Help similarity index 100% rename from !NetSurf/Resources/nl/!Help rename to frontends/riscos/appdir/Resources/nl/!Help diff --git a/frontends/riscos/appdir/Resources/nl/Messages b/frontends/riscos/appdir/Resources/nl/Messages new file mode 120000 index 000000000..20acc40f2 --- /dev/null +++ b/frontends/riscos/appdir/Resources/nl/Messages @@ -0,0 +1 @@ +../../../../../resources/nl/Messages \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/nl/credits.html,faf b/frontends/riscos/appdir/Resources/nl/credits.html,faf new file mode 120000 index 000000000..2380aa33c --- /dev/null +++ b/frontends/riscos/appdir/Resources/nl/credits.html,faf @@ -0,0 +1 @@ +../../../../../resources/nl/credits.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/nl/licence.html,faf b/frontends/riscos/appdir/Resources/nl/licence.html,faf new file mode 120000 index 000000000..46804ce86 --- /dev/null +++ b/frontends/riscos/appdir/Resources/nl/licence.html,faf @@ -0,0 +1 @@ +../../../../../resources/nl/licence.html \ No newline at end of file diff --git a/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/frontends/riscos/appdir/Resources/nl/welcome.html,faf new file mode 120000 index 000000000..6de5c4a73 --- /dev/null +++ b/frontends/riscos/appdir/Resources/nl/welcome.html,faf @@ -0,0 +1 @@ +../../../../../resources/nl/welcome.html \ No newline at end of file