Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d73f62aabc8dd31ceeed92c750cceeb934dc3cbf
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d73f62aabc8dd31ceeed92c750cceeb934dc3cbf
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d73f62aabc8dd31ceeed92c750cceeb934dc3cbf
The branch, master has been updated
via d73f62aabc8dd31ceeed92c750cceeb934dc3cbf (commit)
via a1d315e3e4c7e6b1d7e4508b81e54ef9add2ff4b (commit)
from e5928ebd5f842dc5ae66543f628af0cede4397bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/d73f62aabc8dd31ceeed92c750cceeb934dc3cbf
commit d73f62aabc8dd31ceeed92c750cceeb934dc3cbf
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
fix warning
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index 5fc4591..e7ce0de 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -23,6 +23,7 @@
#include "amiga/filetype.h"
#include "amiga/plugin_hack.h"
#include "content/content_protected.h"
+#include "content/hlcache.h"
#include "desktop/plotters.h"
#include "render/box.h"
#include "utils/log.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/a1d315e3e4c7e6b1d7e4508b81e54ef9add2ff4b
commit a1d315e3e4c7e6b1d7e4508b81e54ef9add2ff4b
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
make install target for Amiga. Target is NetSurf_Amiga/netsurf.lha
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index f2d23bb..18659a8 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -90,3 +90,35 @@ S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF)
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-amiga: netsurf.lha
+
+AMIGA_LANGUAGES := de en fr it ja nl
+AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info
favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
+AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle
+AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES))
$(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
+AMIGA_DISTRIBUTION_FILES := amiga/dist/*
+AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
+
+netsurf.lha: NetSurf
+ $(VQ)echo Creating netsurf.lha
+ $(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
+ $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp NetSurf $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)cp -r $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp \!NetSurf/Resources/AdBlock,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
+ $(Q)cp \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
+ $(Q)cp \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
+ $(Q)cp \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
+ $(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
+ $(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
+ $(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
+ lha a netsurf.lha NetSurf NetSurf.info AutoInstall
+
diff --git a/amiga/dist/AutoInstall b/amiga/dist/AutoInstall
deleted file mode 100755
index c7ed154..0000000
--- a/amiga/dist/AutoInstall
+++ /dev/null
@@ -1,3 +0,0 @@
-; AmiUpdate AutoInstall for NetSurf
-cd NetSurf
-Installer Install APPNAME NetSurfAutoInstall DEFUSER NOVICE
diff --git a/amiga/pkg/AutoInstall b/amiga/pkg/AutoInstall
new file mode 100755
index 0000000..c7ed154
--- /dev/null
+++ b/amiga/pkg/AutoInstall
@@ -0,0 +1,3 @@
+; AmiUpdate AutoInstall for NetSurf
+cd NetSurf
+Installer Install APPNAME NetSurfAutoInstall DEFUSER NOVICE
-----------------------------------------------------------------------
Summary of changes:
amiga/Makefile.target | 32 ++++++++++++++++++++++++++++++++
amiga/{dist => pkg}/AutoInstall | 0
amiga/plugin_hack.c | 1 +
3 files changed, 33 insertions(+), 0 deletions(-)
rename amiga/{dist => pkg}/AutoInstall (100%)
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index f2d23bb..18659a8 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -90,3 +90,35 @@ S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF)
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-amiga: netsurf.lha
+
+AMIGA_LANGUAGES := de en fr it ja nl
+AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info
favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
+AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle
+AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES))
$(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
+AMIGA_DISTRIBUTION_FILES := amiga/dist/*
+AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
+
+netsurf.lha: NetSurf
+ $(VQ)echo Creating netsurf.lha
+ $(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
+ $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp NetSurf $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)cp -r $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp \!NetSurf/Resources/AdBlock,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
+ $(Q)cp \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
+ $(Q)cp \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
+ $(Q)cp \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
+ $(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
+ $(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
+ $(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
+ lha a netsurf.lha NetSurf NetSurf.info AutoInstall
+
diff --git a/amiga/dist/AutoInstall b/amiga/pkg/AutoInstall
similarity index 100%
rename from amiga/dist/AutoInstall
rename to amiga/pkg/AutoInstall
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index 5fc4591..e7ce0de 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -23,6 +23,7 @@
#include "amiga/filetype.h"
#include "amiga/plugin_hack.h"
#include "content/content_protected.h"
+#include "content/hlcache.h"
#include "desktop/plotters.h"
#include "render/box.h"
#include "utils/log.h"
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
