mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-03 09:44:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move !NetSurf into frontends/riscos and fix up

Browse Source
This commit is contained in:
Daniel Silverstone 2018-04-22 11:15:23 +01:00
parent e864997842
commit de806db28e
72 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
!NetSurf/Resources/AdBlock,f79
View File

@ -1 +0,0 @@
../../resources/adblock.css

1
!NetSurf/Resources/CSS,f79
View File

@ -1 +0,0 @@
../../resources/default.css

1
!NetSurf/Resources/Icons
View File

@ -1 +0,0 @@
../../resources/icons

1
!NetSurf/Resources/Quirks,f79
View File

@ -1 +0,0 @@
../../resources/quirks.css

1
!NetSurf/Resources/ca-bundle
View File

@ -1 +0,0 @@
../../resources/ca-bundle

1
!NetSurf/Resources/de/welcome.html,faf
View File

@ -1 +0,0 @@
../../../resources/de/welcome.html

1
!NetSurf/Resources/en/credits.html,faf
View File

@ -1 +0,0 @@
../../../resources/en/credits.html

1
!NetSurf/Resources/en/licence.html,faf
View File

@ -1 +0,0 @@
../../../resources/en/licence.html

1
!NetSurf/Resources/en/maps.html,faf
View File

@ -1 +0,0 @@
../../../resources/en/maps.html

1
!NetSurf/Resources/en/welcome.html,faf
View File

@ -1 +0,0 @@
../../../resources/en/welcome.html

1
!NetSurf/Resources/internal.css,f79
View File

@ -1 +0,0 @@
../../resources/internal.css

1
!NetSurf/Resources/it/credits.html,faf
View File

@ -1 +0,0 @@
../../../resources/it/credits.html

1
!NetSurf/Resources/it/licence.html,faf
View File

@ -1 +0,0 @@
../../../resources/it/licence.html

1
!NetSurf/Resources/it/welcome.html,faf
View File

@ -1 +0,0 @@
../../../resources/it/welcome.html

1
!NetSurf/Resources/ja/welcome.html,faf
View File

@ -1 +0,0 @@
../../../resources/ja/welcome.html

1
!NetSurf/Resources/netsurf.png,b60
View File

@ -1 +0,0 @@
../../resources/netsurf.png

1
!NetSurf/Resources/nl/credits.html,faf
View File

@ -1 +0,0 @@
../../../resources/nl/credits.html

1
!NetSurf/Resources/nl/licence.html,faf
View File

@ -1 +0,0 @@
../../../resources/nl/licence.html

1
!NetSurf/Resources/nl/welcome.html,faf
View File

@ -1 +0,0 @@
../../../resources/nl/welcome.html

24
.gitignore vendored
View File

@ -1,16 +1,16 @@
*~ *~
\!NetSurf/!Run,feb frontends/riscos/appdir/!Run,feb
\!NetSurf/!RunImage,ff8 frontends/riscos/appdir/!RunImage,ff8
\!NetSurf/!Help,feb frontends/riscos/appdir/!Help,feb
\!NetSurf/Resources/en/Templates,fec frontends/riscos/appdir/Resources/en/Templates,fec
\!NetSurf/Resources/en/Messages frontends/riscos/appdir/Resources/fr/Templates,fec
\!NetSurf/Resources/fr/Templates,fec frontends/riscos/appdir/Resources/de/Templates,fec
\!NetSurf/Resources/fr/Messages frontends/riscos/appdir/Resources/nl/Templates,fec
\!NetSurf/Resources/de/Templates,fec resources/en/Messages
\!NetSurf/Resources/de/Messages resources/fr/Messages
\!NetSurf/Resources/nl/Templates,fec resources/de/Messages
\!NetSurf/Resources/nl/Messages resources/nl/Messages
\!NetSurf/Resources/it/Messages resources/it/Messages
frontends/gtk/res/en/Messages frontends/gtk/res/en/Messages
frontends/gtk/res/fr/Messages frontends/gtk/res/fr/Messages
frontends/gtk/res/de/Messages frontends/gtk/res/de/Messages

3
docs/PACKAGING-GTK
View File

@ -24,8 +24,7 @@
The GTK port of NetSurf requires access to some resources at run time. 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 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 symlinks into the top level resources directory. Not all of the files in the
for the native RISC OS build. None of the other files from the !NetSurf
directory are required - the symlinks are used only as a way of making 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 checkouts smaller and making sure changes to one set of resources updates
the other. the other.

26
frontends/riscos/Makefile
View File

@ -16,7 +16,7 @@ $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile e
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
!NetSurf/Resources/$(TPL)/Templates$(TPLEXT)) $(FRONTEND_SOURCE_DIR)/appdir/Resources/$(TPL)/Templates$(TPLEXT))
RESOURCES = $(TPD_RISCOS) 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 # are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) 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 # The filter and target for split messages
MESSAGES_FILTER=ro 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: $@" $(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@ $(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: $@" $(VQ)echo " CP: $@"
$(Q)cp $< $@ $(Q)cp $< $@
@ -86,16 +86,16 @@ $(DEPROOT)/squeeze.d: $(EXETARGET)
$(Q)$(SQUEEZE) -f -v $(EXETARGET) $(Q)$(SQUEEZE) -f -v $(EXETARGET)
$(Q)$(TOUCH) $@ $(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: clean-run:
$(VQ)echo " CLEAN: !NetSurf/!Run$(RUNEXT)" $(VQ)echo " CLEAN: !Run$(RUNEXT)"
$(Q) $(RM) !NetSurf/!Run$(RUNEXT) $(Q) $(RM) $(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT)
clean-help: clean-help:
$(VQ)echo " CLEAN: !NetSurf/!Help$(RUNEXT)" $(VQ)echo " CLEAN: !Help$(RUNEXT)"
$(Q) $(RM) !NetSurf/!Help$(RUNEXT) $(Q) $(RM) $(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT)
CLEANS += clean-run clean-help CLEANS += clean-run clean-help
@ -109,12 +109,12 @@ TPL_RISCOS := $(addprefix $(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS))
# Template target creation macro # Template target creation macro
define compile_template define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2) $(FRONTEND_SOURCE_DIR)/appdir/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(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) - $$@ $$(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 endef
@ -142,7 +142,7 @@ package-riscos: netsurf.zip
netsurf.zip: $(EXETARGET) netsurf.zip: $(EXETARGET)
$(eval $@_TMPDIR := $(shell mktemp -d)) $(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@ $(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) $(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/!Boot $($@_TMPDIR)
$(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!System $($@_TMPDIR) $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!System $($@_TMPDIR)

0
!NetSurf/!Boot,feb → frontends/riscos/appdir/!Boot,feb
View File

0
!NetSurf/!Sprites,ff9 → frontends/riscos/appdir/!Sprites,ff9
View File

0
!NetSurf/!Sprites22,ff9 → frontends/riscos/appdir/!Sprites22,ff9
View File

0
!NetSurf/5Sprites,ff9 → frontends/riscos/appdir/5Sprites,ff9
View File

0
!NetSurf/5Sprites11,ff9 → frontends/riscos/appdir/5Sprites11,ff9
View File

0
!NetSurf/5Sprites22,ff9 → frontends/riscos/appdir/5Sprites22,ff9
View File

0
!NetSurf/ASprites,ff9 → frontends/riscos/appdir/ASprites,ff9
View File

0
!NetSurf/ASprites11,ff9 → frontends/riscos/appdir/ASprites11,ff9
View File

0
!NetSurf/ASprites22,ff9 → frontends/riscos/appdir/ASprites22,ff9
View File

0
!NetSurf/ChkSprites,ffb → frontends/riscos/appdir/ChkSprites,ffb
View File

0
!NetSurf/Docs/online,b60 → frontends/riscos/appdir/Docs/online,b60
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 165 B

0
!NetSurf/FixFonts,ffb → frontends/riscos/appdir/FixFonts,ffb
View File

0
!NetSurf/KickNS,ffb → frontends/riscos/appdir/KickNS,ffb
View File

0
!NetSurf/OpenChoices,feb → frontends/riscos/appdir/OpenChoices,feb
View File

0
!NetSurf/OpenHelp,ffb → frontends/riscos/appdir/OpenHelp,ffb
View File

0
!NetSurf/OpenScrap,feb → frontends/riscos/appdir/OpenScrap,feb
View File

1
frontends/riscos/appdir/Resources/AdBlock,f79 Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/adblock.css

0
!NetSurf/Resources/Aletheia,ffd → frontends/riscos/appdir/Resources/Aletheia,ffd
View File

1
frontends/riscos/appdir/Resources/CSS,f79 Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/default.css

0
!NetSurf/Resources/Fonts/NSSymbol/Encoding → frontends/riscos/appdir/Resources/Fonts/NSSymbol/Encoding
View File

0
!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6 → frontends/riscos/appdir/Resources/Fonts/NSSymbol/IntMetrics,ff6
View File

0
!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6 → frontends/riscos/appdir/Resources/Fonts/NSSymbol/Outlines,ff6
View File

1
frontends/riscos/appdir/Resources/Icons Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/icons

0
!NetSurf/Resources/Image,ff9 → frontends/riscos/appdir/Resources/Image,ff9
View File

0
!NetSurf/Resources/LangNames → frontends/riscos/appdir/Resources/LangNames
View File

1
frontends/riscos/appdir/Resources/Quirks,f79 Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/quirks.css

0
!NetSurf/Resources/SearchEngines → frontends/riscos/appdir/Resources/SearchEngines
View File

0
!NetSurf/Resources/Sprites,ff9 → frontends/riscos/appdir/Resources/Sprites,ff9
View File

1
frontends/riscos/appdir/Resources/ca-bundle Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/ca-bundle

1
frontends/riscos/appdir/Resources/de/Messages Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/de/Messages

1
frontends/riscos/appdir/Resources/de/welcome.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/de/welcome.html

0
!NetSurf/Resources/en/!Help → frontends/riscos/appdir/Resources/en/!Help
View File

1
frontends/riscos/appdir/Resources/en/Messages Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/en/Messages

1
frontends/riscos/appdir/Resources/en/credits.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/en/credits.html

1
frontends/riscos/appdir/Resources/en/licence.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/en/licence.html

1
frontends/riscos/appdir/Resources/en/maps.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/en/maps.html

1
frontends/riscos/appdir/Resources/en/welcome.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/en/welcome.html

1
frontends/riscos/appdir/Resources/fr/Messages Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/fr/Messages

1
frontends/riscos/appdir/Resources/internal.css,f79 Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/internal.css

1
frontends/riscos/appdir/Resources/it/Messages Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/it/Messages

1
frontends/riscos/appdir/Resources/it/credits.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/it/credits.html

1
frontends/riscos/appdir/Resources/it/licence.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/it/licence.html

1
frontends/riscos/appdir/Resources/it/welcome.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/it/welcome.html

1
frontends/riscos/appdir/Resources/ja/welcome.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/ja/welcome.html

1
frontends/riscos/appdir/Resources/netsurf.png,b60 Symbolic link
View File

@ -0,0 +1 @@
../../../../resources/netsurf.png

0
!NetSurf/Resources/nl/!Help → frontends/riscos/appdir/Resources/nl/!Help
View File

1
frontends/riscos/appdir/Resources/nl/Messages Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/nl/Messages

1
frontends/riscos/appdir/Resources/nl/credits.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/nl/credits.html

1
frontends/riscos/appdir/Resources/nl/licence.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/nl/licence.html

1
frontends/riscos/appdir/Resources/nl/welcome.html,faf Symbolic link
View File

@ -0,0 +1 @@
../../../../../resources/nl/welcome.html