Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d1693c27c0d9658b655c158a9652f87683719325
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d1693c27c0d9658b655c158a9652f87683719325
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d1693c27c0d9658b655c158a9652f87683719325
The branch, master has been updated
via d1693c27c0d9658b655c158a9652f87683719325 (commit)
via 9be0f4ccaf9696173fb910660352be6648811040 (commit)
from 2d9ed9cbc4bd611d027b07f40bcf2dad68632857 (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=d1693c27c0d9658b655c158a9652f87683719325
commit d1693c27c0d9658b655c158a9652f87683719325
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix windows installer generation
the windows installer package generation was not correctly
parameterised which resulted in fetching resources from incorrect
locations. Additionally the clean target was not removing generated
installer output.
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 41c8b8c..1b93e4c 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -3,10 +3,14 @@
#
# This file is part of NetSurf
+
+VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}'
desktop/version.c)
+VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}'
desktop/version.c)
+
+
LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
-
$(eval $(call pkg_config_find_and_add,libcares,Cares))
$(eval $(call pkg_config_find_and_add,zlib,ZLib))
@@ -68,10 +72,25 @@ install-windows:
package-windows: netsurf-installer.exe
WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css
-WIN_RES_INS_OBJ := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(WIN_RES_OBJ))
$(OBJROOT)/messages
+WIN_RES_INS_OBJ := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(WIN_RES_OBJ))
$(OBJROOT)/messages-en
+
+# deal with making installer generation verbose
+ifeq ($(Q),)
+NSIS_VERBOSE := 4
+else
+NSIS_VERBOSE := 0
+endif
-$(OBJROOT)/messages: resources/FatMessages
- $(Q)$(SPLIT_MESSAGES) -l en -p win -f messages resources/FatMessages >
$@
+# installer messages generation
+$(OBJROOT)/messages-en: resources/FatMessages
+ $(VQ)echo "MSGSPLIT: Language: en Filter: win"
+ $(Q)$(SPLIT_MESSAGES) -l en -p win -f messages -o $@ $<
netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
- makensis -V4 -NOCD $(FRONTEND_RESOURCES_DIR)/installer.nsi
+ $(VQ)echo "MAKENSIS: $@"
+ $(Q)makensis -V$(NSIS_VERBOSE) -NOCD -DOBJROOT=$(OBJROOT)
-DRESDIR=$(FRONTEND_RESOURCES_DIR) -DVERSIONMAJOR=$(VERSION_MAJ)
-DVERSIONMINOR=$(VERSION_MIN) -DOUTFNAME=$@
$(FRONTEND_RESOURCES_DIR)/installer.nsi
+
+clean-installer:
+ $(VQ)echo " CLEAN: netsurf-installer.exe"
+ $(Q)$(RM) netsurf-installer.exe
+CLEANS += clean-installer
diff --git a/frontends/windows/res/installer.nsi
b/frontends/windows/res/installer.nsi
index 0c733db..17afee2 100644
--- a/frontends/windows/res/installer.nsi
+++ b/frontends/windows/res/installer.nsi
@@ -3,21 +3,40 @@
# show up in a few places.
# All the other settings can be tweaked by editing the !defines at the top of
this script
+
!define APPNAME "NetSurf"
!define COMPANYNAME "NetSurf"
!define DESCRIPTION "Web Browser"
-# These three must be integers
-!define VERSIONMAJOR 3
-!define VERSIONMINOR 6
-!define VERSIONBUILD 1
+
+# The version values must be simple integers
+!ifndef VERSIONMAJOR
+ !define VERSIONMAJOR 3
+!endif
+!ifndef VERSIONMINOR
+ !define VERSIONMINOR 7
+!endif
+!ifndef VERSIONBUILD
+ !define VERSIONBUILD 0
+!endif
+
# These will be displayed by the "Click here for support information" link in
"Add/Remove Programs"
-# It is possible to use "mailto:"; links in here to open the email client
!define HELPURL "http://www.netsurf-browser.org/"; # "Support Information" link
!define UPDATEURL "http://www.netsurf-browser.org/"; # "Product Updates" link
!define ABOUTURL "http://www.netsurf-browser.org/"; # "Publisher" link
# This is the size (in kB) of all the files copied into "Program Files"
!define INSTALLSIZE 9000
-
+
+# output filename
+!ifndef OUTFNAME
+ !define OUTFNAME "netsurf-installer.exe"
+!endif
+
+# path to resources
+!ifndef RESDIR
+ !define RESDIR "frontends/windows/res"
+!endif
+
+
RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned
on)
InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
@@ -26,8 +45,8 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
LicenseData "COPYING"
# This will be in the installer/uninstaller's title bar
Name "${COMPANYNAME} - ${APPNAME}"
-Icon "frontends\windows\res\NetSurf.ico"
-outFile "netsurf-installer.exe"
+Icon "${RESDIR}\NetSurf.ico"
+outFile "${OUTFNAME}"
BrandingText "${COMPANYNAME}"
!include LogicLib.nsh
@@ -53,21 +72,23 @@ function .onInit
functionEnd
section "install"
- # Files for the install directory - to build the installer, these
should be in the same directory as the install script (this file)
+ # Files for the install directory
+
+ # Default output path
setOutPath $INSTDIR
- # Files added here should be removed by the uninstaller (see section
"uninstall")
- file "NetSurf.exe"
- file /oname=NetSurf.ico "frontends\windows\res\NetSurf.ico"
- file /oname=default.css "frontends\windows\res\default.css"
- file /oname=internal.css "frontends\windows\res\internal.css"
- file /oname=adblock.css "frontends\windows\res\adblock.css"
- file /oname=welcome.html "frontends\windows\res\welcome.html"
- file /oname=credits.html "frontends\windows\res\credits.html"
- file /oname=licence.html "frontends\windows\res\licence.html"
- file /oname=netsurf.png "frontends\windows\res\netsurf.png"
- file /oname=messages "build-Linux-windows\messages"
- file /oname=ca-bundle.crt "frontends\windows\res\ca-bundle.crt"
- # Add any other files for the install directory (license files, app
data, etc) here
+
+ # Files added here should be removed by the uninstaller section
+ file "NetSurf.exe"
+ file /oname=NetSurf.ico "${RESDIR}\NetSurf.ico"
+ file /oname=default.css "${RESDIR}\default.css"
+ file /oname=internal.css "${RESDIR}\internal.css"
+ file /oname=adblock.css "${RESDIR}\adblock.css"
+ file /oname=welcome.html "${RESDIR}\welcome.html"
+ file /oname=credits.html "${RESDIR}\credits.html"
+ file /oname=licence.html "${RESDIR}\licence.html"
+ file /oname=netsurf.png "${RESDIR}\netsurf.png"
+ file /oname=messages "${OBJROOT}\messages-en"
+ file /oname=ca-bundle.crt "${RESDIR}\ca-bundle.crt"
# Uninstaller - See function un.onInit and section "uninstall" for
configuration
writeUninstaller "$INSTDIR\uninstall.exe"
@@ -95,7 +116,7 @@ section "install"
# Set the INSTALLSIZE constant (!defined at the top of this script) so
Add/Remove Programs can accurately report the size
WriteRegDWORD HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
"EstimatedSize" ${INSTALLSIZE}
sectionEnd
-
+
# Uninstaller
function un.onInit
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9be0f4ccaf9696173fb910660352be6648811040
commit 9be0f4ccaf9696173fb910660352be6648811040
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fixup usage of directory creation macro in Makefiles
diff --git a/Makefile b/Makefile
index 77ab062..5f2697f 100644
--- a/Makefile
+++ b/Makefile
@@ -640,7 +640,7 @@ define split_messages
$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
$$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
- $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1)
+ $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1)
$$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o
$$@ $$<
$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
diff --git a/content/handlers/javascript/duktape/Makefile
b/content/handlers/javascript/duktape/Makefile
index 37e33d5..fce79de 100644
--- a/content/handlers/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -12,13 +12,13 @@ BINDINGS := $(wildcard
content/handlers/javascript/duktape/*.bnd)
GBFLAGS+=-D
$(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile:
content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
- $(Q)mkdir -p $(OBJROOT)/duktape
+ $(Q)$(MKDIR) -p $(OBJROOT)/duktape
$(VQ)echo " GENBIND: $<"
$(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $<
$(OBJROOT)/duktape
# create unimplemented report for doxygen
Docs/UnimplementedJavascript.txt:
content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
- $(Q)mkdir -p $(OBJROOT)/duktape
+ $(Q)$(MKDIR) -p $(OBJROOT)/duktape
$(VQ)echo "/** \page unimplemented Unimplemented javascript bindings" >
$@
$(VQ)echo "This is a list of all the binding methods, getters and
setters without an implementation in a binding." >> $@
$(VQ)echo "" >> $@
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 8115f2f..aa60207 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -76,9 +76,9 @@ AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
- $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)$(MKDIR) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -rp $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines
>$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 60b7f87..7bc441c 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -147,13 +147,13 @@ ifneq ($(strip $(STACK)),)
endif
$(Q)rm -rf $(ATARI_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
- $(Q)mkdir $(ATARI_TARGET_DIR)
- $(Q)mkdir $(ATARI_TARGET_DIR)doc
- $(Q)mkdir $(ATARI_TARGET_DIR)downloads
- $(Q)mkdir $(ATARI_TARGET_DIR)res
- $(Q)mkdir $(ATARI_TARGET_DIR)res/fonts
- $(Q)mkdir $(ATARI_TARGET_DIR)res/icons
- $(Q)mkdir $(ATARI_TARGET_DIR)res/cache
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)doc
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)downloads
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/fonts
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/icons
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/cache
$(Q)touch $(ATARI_TARGET_DIR)cookies
$(Q)touch $(ATARI_TARGET_DIR)url.db
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index f40cce4..7693ac3 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -90,15 +90,15 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
# ----------------------------------------------------------------------------
install-beos:
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/license
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/license
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# ----------------------------------------------------------------------------
# Package target
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index 8935d7b..a0ebfbb 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -171,7 +171,7 @@ define make_lproj
R_RESOURCES += $$(OBJROOT)/$(1).lproj
$$(OBJROOT)/$(1).lproj: $(2)
$(VQ)echo Bundling language $(1)
- $(Q)mkdir -p $$@
+ $(Q)$(MKDIR) -p $$@
$(Q)cp -pLR $(2) $$@
$(Q)$(SPLIT_MESSAGES) -l $(1) -p cocoa -f messages
resources/FatMessages > $$@/Messages
endef
@@ -182,7 +182,7 @@ $$(OBJROOT)/$(2).lproj:
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(1)
$$(OBJROOT)/created
$(VQ)echo Compiling XIB $(1) for language $(2)
- $(Q)mkdir -p $$(OBJROOT)/$(2).lproj
+ $(Q)$(MKDIR) -p $$(OBJROOT)/$(2).lproj
$(Q)$(FRONTEND_SOURCE_DIR)/compile-xib.sh
$(FRONTEND_RESOURCES_DIR)/$(1) $(2) $$@
ifeq ($(wildcard
$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings),$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings)
@@ -202,16 +202,16 @@ install-cocoa: NetSurf.app
NetSurf.app: NetSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES)
NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
- $(Q)mkdir -p NetSurf.app/Contents/MacOS
+ $(Q)$(MKDIR) -p NetSurf.app/Contents/MacOS
$(Q)cp NetSurf NetSurf.app/Contents/MacOS
$(Q)rm -rf NetSurf.app/Contents/Resources
- $(Q)mkdir -p NetSurf.app/Contents/Resources
+ $(Q)$(MKDIR) -p NetSurf.app/Contents/Resources
$(Q)cp -pLR $(R_RESOURCES) NetSurf.app/Contents/Resources
$(Q)echo 'APPL????' > NetSurf.app/Contents/PkgInfo
NetSurf.app/Contents/Info.plist: $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist
$(FRONTEND_SOURCE_DIR)/Makefile
$(VQ)echo Generating Info.plist
- $(Q)mkdir -p NetSurf.app/Contents
+ $(Q)$(MKDIR) -p NetSurf.app/Contents
$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
-e 's/$${PRODUCT_NAME.*}/$(EXETARGET)/' \
-e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 3d47f8f..6d2acb0 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -171,8 +171,8 @@ NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css
credits.html \
netsurf.png quirks.css welcome.html maps.html Messages
install-framebuffer:
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb
$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL
$(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
$(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages |
gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index 76ef998..afbfcd7 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -198,11 +198,11 @@ GTK_TRANSLATIONS_HTML := de en fr it ja nl
NSGTK_RESOURCES_DESTDIR := $(DESTDIR)$(word 1,$(subst :,
,$(NETSURF_GTK_RES_PATH)))
install-gtk:
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_GTK_BIN)
$(Q)install $(EXETARGET)
$(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk$(SUBTARGET)
- $(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/icons
+ $(Q)$(MKDIR) -p $(NSGTK_RESOURCES_DESTDIR)/icons
$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png
$(NSGTK_RESOURCES_DESTDIR)/icons
- $(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/throbber
+ $(Q)$(MKDIR) -p $(NSGTK_RESOURCES_DESTDIR)/throbber
$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png
$(NSGTK_RESOURCES_DESTDIR)/throbber
$(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) |
tar -xv -C $(NSGTK_RESOURCES_DESTDIR) -f -
$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(NSGTK_RESOURCES_DESTDIR)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index b457f02..87790ac 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -110,7 +110,7 @@ TPL_RISCOS := $(addprefix
$(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS))
define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(2)"
- $$(Q)mkdir -p !NetSurf/Resources/$(1)
+ $$(Q)$$(MKDIR) -p !NetSurf/Resources/$(1)
$$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@
CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT)
diff --git a/test/Makefile b/test/Makefile
index 7a763e9..fd54fb9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -166,7 +166,7 @@ coverage: test
$(TESTROOT)/created:
$(VQ)echo " MKDIR: $(TESTROOT)"
- $(Q)$(MKDIR) $(TESTROOT)
+ $(Q)$(MKDIR) -p $(TESTROOT)
$(Q)$(TOUCH) $@
.PHONY: test-clean
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
content/handlers/javascript/duktape/Makefile | 4 +-
frontends/amiga/Makefile | 4 +-
frontends/atari/Makefile | 14 +++---
frontends/beos/Makefile | 18 +++----
frontends/cocoa/Makefile | 10 ++--
frontends/framebuffer/Makefile | 4 +-
frontends/gtk/Makefile | 6 +--
frontends/riscos/Makefile | 2 +-
frontends/windows/Makefile | 29 +++++++++--
frontends/windows/res/installer.nsi | 67 +++++++++++++++++---------
test/Makefile | 2 +-
12 files changed, 101 insertions(+), 61 deletions(-)
diff --git a/Makefile b/Makefile
index 77ab062..5f2697f 100644
--- a/Makefile
+++ b/Makefile
@@ -640,7 +640,7 @@ define split_messages
$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
$$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
- $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1)
+ $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1)
$$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o
$$@ $$<
$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
diff --git a/content/handlers/javascript/duktape/Makefile
b/content/handlers/javascript/duktape/Makefile
index 37e33d5..fce79de 100644
--- a/content/handlers/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -12,13 +12,13 @@ BINDINGS := $(wildcard
content/handlers/javascript/duktape/*.bnd)
GBFLAGS+=-D
$(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile:
content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
- $(Q)mkdir -p $(OBJROOT)/duktape
+ $(Q)$(MKDIR) -p $(OBJROOT)/duktape
$(VQ)echo " GENBIND: $<"
$(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $<
$(OBJROOT)/duktape
# create unimplemented report for doxygen
Docs/UnimplementedJavascript.txt:
content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
- $(Q)mkdir -p $(OBJROOT)/duktape
+ $(Q)$(MKDIR) -p $(OBJROOT)/duktape
$(VQ)echo "/** \page unimplemented Unimplemented javascript bindings" >
$@
$(VQ)echo "This is a list of all the binding methods, getters and
setters without an implementation in a binding." >> $@
$(VQ)echo "" >> $@
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 8115f2f..aa60207 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -76,9 +76,9 @@ AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
- $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)$(MKDIR) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -rp $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines
>$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 60b7f87..7bc441c 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -147,13 +147,13 @@ ifneq ($(strip $(STACK)),)
endif
$(Q)rm -rf $(ATARI_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
- $(Q)mkdir $(ATARI_TARGET_DIR)
- $(Q)mkdir $(ATARI_TARGET_DIR)doc
- $(Q)mkdir $(ATARI_TARGET_DIR)downloads
- $(Q)mkdir $(ATARI_TARGET_DIR)res
- $(Q)mkdir $(ATARI_TARGET_DIR)res/fonts
- $(Q)mkdir $(ATARI_TARGET_DIR)res/icons
- $(Q)mkdir $(ATARI_TARGET_DIR)res/cache
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)doc
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)downloads
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/fonts
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/icons
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/cache
$(Q)touch $(ATARI_TARGET_DIR)cookies
$(Q)touch $(ATARI_TARGET_DIR)url.db
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index f40cce4..7693ac3 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -90,15 +90,15 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
# ----------------------------------------------------------------------------
install-beos:
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/license
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/license
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# ----------------------------------------------------------------------------
# Package target
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index 8935d7b..a0ebfbb 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -171,7 +171,7 @@ define make_lproj
R_RESOURCES += $$(OBJROOT)/$(1).lproj
$$(OBJROOT)/$(1).lproj: $(2)
$(VQ)echo Bundling language $(1)
- $(Q)mkdir -p $$@
+ $(Q)$(MKDIR) -p $$@
$(Q)cp -pLR $(2) $$@
$(Q)$(SPLIT_MESSAGES) -l $(1) -p cocoa -f messages
resources/FatMessages > $$@/Messages
endef
@@ -182,7 +182,7 @@ $$(OBJROOT)/$(2).lproj:
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(1)
$$(OBJROOT)/created
$(VQ)echo Compiling XIB $(1) for language $(2)
- $(Q)mkdir -p $$(OBJROOT)/$(2).lproj
+ $(Q)$(MKDIR) -p $$(OBJROOT)/$(2).lproj
$(Q)$(FRONTEND_SOURCE_DIR)/compile-xib.sh
$(FRONTEND_RESOURCES_DIR)/$(1) $(2) $$@
ifeq ($(wildcard
$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings),$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings)
@@ -202,16 +202,16 @@ install-cocoa: NetSurf.app
NetSurf.app: NetSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES)
NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
- $(Q)mkdir -p NetSurf.app/Contents/MacOS
+ $(Q)$(MKDIR) -p NetSurf.app/Contents/MacOS
$(Q)cp NetSurf NetSurf.app/Contents/MacOS
$(Q)rm -rf NetSurf.app/Contents/Resources
- $(Q)mkdir -p NetSurf.app/Contents/Resources
+ $(Q)$(MKDIR) -p NetSurf.app/Contents/Resources
$(Q)cp -pLR $(R_RESOURCES) NetSurf.app/Contents/Resources
$(Q)echo 'APPL????' > NetSurf.app/Contents/PkgInfo
NetSurf.app/Contents/Info.plist: $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist
$(FRONTEND_SOURCE_DIR)/Makefile
$(VQ)echo Generating Info.plist
- $(Q)mkdir -p NetSurf.app/Contents
+ $(Q)$(MKDIR) -p NetSurf.app/Contents
$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
-e 's/$${PRODUCT_NAME.*}/$(EXETARGET)/' \
-e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 3d47f8f..6d2acb0 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -171,8 +171,8 @@ NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css
credits.html \
netsurf.png quirks.css welcome.html maps.html Messages
install-framebuffer:
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb
$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL
$(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
$(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages |
gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index 76ef998..afbfcd7 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -198,11 +198,11 @@ GTK_TRANSLATIONS_HTML := de en fr it ja nl
NSGTK_RESOURCES_DESTDIR := $(DESTDIR)$(word 1,$(subst :,
,$(NETSURF_GTK_RES_PATH)))
install-gtk:
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_GTK_BIN)
$(Q)install $(EXETARGET)
$(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk$(SUBTARGET)
- $(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/icons
+ $(Q)$(MKDIR) -p $(NSGTK_RESOURCES_DESTDIR)/icons
$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png
$(NSGTK_RESOURCES_DESTDIR)/icons
- $(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/throbber
+ $(Q)$(MKDIR) -p $(NSGTK_RESOURCES_DESTDIR)/throbber
$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png
$(NSGTK_RESOURCES_DESTDIR)/throbber
$(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) |
tar -xv -C $(NSGTK_RESOURCES_DESTDIR) -f -
$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(NSGTK_RESOURCES_DESTDIR)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index b457f02..87790ac 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -110,7 +110,7 @@ TPL_RISCOS := $(addprefix
$(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS))
define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(2)"
- $$(Q)mkdir -p !NetSurf/Resources/$(1)
+ $$(Q)$$(MKDIR) -p !NetSurf/Resources/$(1)
$$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@
CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT)
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 41c8b8c..1b93e4c 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -3,10 +3,14 @@
#
# This file is part of NetSurf
+
+VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}'
desktop/version.c)
+VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}'
desktop/version.c)
+
+
LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
-
$(eval $(call pkg_config_find_and_add,libcares,Cares))
$(eval $(call pkg_config_find_and_add,zlib,ZLib))
@@ -68,10 +72,25 @@ install-windows:
package-windows: netsurf-installer.exe
WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css
-WIN_RES_INS_OBJ := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(WIN_RES_OBJ))
$(OBJROOT)/messages
+WIN_RES_INS_OBJ := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(WIN_RES_OBJ))
$(OBJROOT)/messages-en
+
+# deal with making installer generation verbose
+ifeq ($(Q),)
+NSIS_VERBOSE := 4
+else
+NSIS_VERBOSE := 0
+endif
-$(OBJROOT)/messages: resources/FatMessages
- $(Q)$(SPLIT_MESSAGES) -l en -p win -f messages resources/FatMessages >
$@
+# installer messages generation
+$(OBJROOT)/messages-en: resources/FatMessages
+ $(VQ)echo "MSGSPLIT: Language: en Filter: win"
+ $(Q)$(SPLIT_MESSAGES) -l en -p win -f messages -o $@ $<
netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
- makensis -V4 -NOCD $(FRONTEND_RESOURCES_DIR)/installer.nsi
+ $(VQ)echo "MAKENSIS: $@"
+ $(Q)makensis -V$(NSIS_VERBOSE) -NOCD -DOBJROOT=$(OBJROOT)
-DRESDIR=$(FRONTEND_RESOURCES_DIR) -DVERSIONMAJOR=$(VERSION_MAJ)
-DVERSIONMINOR=$(VERSION_MIN) -DOUTFNAME=$@
$(FRONTEND_RESOURCES_DIR)/installer.nsi
+
+clean-installer:
+ $(VQ)echo " CLEAN: netsurf-installer.exe"
+ $(Q)$(RM) netsurf-installer.exe
+CLEANS += clean-installer
diff --git a/frontends/windows/res/installer.nsi
b/frontends/windows/res/installer.nsi
index 0c733db..17afee2 100644
--- a/frontends/windows/res/installer.nsi
+++ b/frontends/windows/res/installer.nsi
@@ -3,21 +3,40 @@
# show up in a few places.
# All the other settings can be tweaked by editing the !defines at the top of
this script
+
!define APPNAME "NetSurf"
!define COMPANYNAME "NetSurf"
!define DESCRIPTION "Web Browser"
-# These three must be integers
-!define VERSIONMAJOR 3
-!define VERSIONMINOR 6
-!define VERSIONBUILD 1
+
+# The version values must be simple integers
+!ifndef VERSIONMAJOR
+ !define VERSIONMAJOR 3
+!endif
+!ifndef VERSIONMINOR
+ !define VERSIONMINOR 7
+!endif
+!ifndef VERSIONBUILD
+ !define VERSIONBUILD 0
+!endif
+
# These will be displayed by the "Click here for support information" link in
"Add/Remove Programs"
-# It is possible to use "mailto:"; links in here to open the email client
!define HELPURL "http://www.netsurf-browser.org/"; # "Support Information" link
!define UPDATEURL "http://www.netsurf-browser.org/"; # "Product Updates" link
!define ABOUTURL "http://www.netsurf-browser.org/"; # "Publisher" link
# This is the size (in kB) of all the files copied into "Program Files"
!define INSTALLSIZE 9000
-
+
+# output filename
+!ifndef OUTFNAME
+ !define OUTFNAME "netsurf-installer.exe"
+!endif
+
+# path to resources
+!ifndef RESDIR
+ !define RESDIR "frontends/windows/res"
+!endif
+
+
RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned
on)
InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
@@ -26,8 +45,8 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
LicenseData "COPYING"
# This will be in the installer/uninstaller's title bar
Name "${COMPANYNAME} - ${APPNAME}"
-Icon "frontends\windows\res\NetSurf.ico"
-outFile "netsurf-installer.exe"
+Icon "${RESDIR}\NetSurf.ico"
+outFile "${OUTFNAME}"
BrandingText "${COMPANYNAME}"
!include LogicLib.nsh
@@ -53,21 +72,23 @@ function .onInit
functionEnd
section "install"
- # Files for the install directory - to build the installer, these
should be in the same directory as the install script (this file)
+ # Files for the install directory
+
+ # Default output path
setOutPath $INSTDIR
- # Files added here should be removed by the uninstaller (see section
"uninstall")
- file "NetSurf.exe"
- file /oname=NetSurf.ico "frontends\windows\res\NetSurf.ico"
- file /oname=default.css "frontends\windows\res\default.css"
- file /oname=internal.css "frontends\windows\res\internal.css"
- file /oname=adblock.css "frontends\windows\res\adblock.css"
- file /oname=welcome.html "frontends\windows\res\welcome.html"
- file /oname=credits.html "frontends\windows\res\credits.html"
- file /oname=licence.html "frontends\windows\res\licence.html"
- file /oname=netsurf.png "frontends\windows\res\netsurf.png"
- file /oname=messages "build-Linux-windows\messages"
- file /oname=ca-bundle.crt "frontends\windows\res\ca-bundle.crt"
- # Add any other files for the install directory (license files, app
data, etc) here
+
+ # Files added here should be removed by the uninstaller section
+ file "NetSurf.exe"
+ file /oname=NetSurf.ico "${RESDIR}\NetSurf.ico"
+ file /oname=default.css "${RESDIR}\default.css"
+ file /oname=internal.css "${RESDIR}\internal.css"
+ file /oname=adblock.css "${RESDIR}\adblock.css"
+ file /oname=welcome.html "${RESDIR}\welcome.html"
+ file /oname=credits.html "${RESDIR}\credits.html"
+ file /oname=licence.html "${RESDIR}\licence.html"
+ file /oname=netsurf.png "${RESDIR}\netsurf.png"
+ file /oname=messages "${OBJROOT}\messages-en"
+ file /oname=ca-bundle.crt "${RESDIR}\ca-bundle.crt"
# Uninstaller - See function un.onInit and section "uninstall" for
configuration
writeUninstaller "$INSTDIR\uninstall.exe"
@@ -95,7 +116,7 @@ section "install"
# Set the INSTALLSIZE constant (!defined at the top of this script) so
Add/Remove Programs can accurately report the size
WriteRegDWORD HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
"EstimatedSize" ${INSTALLSIZE}
sectionEnd
-
+
# Uninstaller
function un.onInit
diff --git a/test/Makefile b/test/Makefile
index 7a763e9..fd54fb9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -166,7 +166,7 @@ coverage: test
$(TESTROOT)/created:
$(VQ)echo " MKDIR: $(TESTROOT)"
- $(Q)$(MKDIR) $(TESTROOT)
+ $(Q)$(MKDIR) -p $(TESTROOT)
$(Q)$(TOUCH) $@
.PHONY: test-clean
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
