r14005 dsilvers - in /trunk/libdom: Makefile bindings/Makefile bindings/hubbub/Makefile bindings/xml/Makefile build/ src/Makefile src/core/Makefile src/events/Makefile src/html/Makefile src/utils/Makefile test/Makefile
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:55:31 2012
New Revision: 14005
URL: http://source.netsurf-browser.org?rev=14005&view=rev
Log:
Update to new NSBUILD infrastructure
Removed:
trunk/libdom/build/
Modified:
trunk/libdom/Makefile
trunk/libdom/bindings/Makefile
trunk/libdom/bindings/hubbub/Makefile
trunk/libdom/bindings/xml/Makefile
trunk/libdom/src/Makefile
trunk/libdom/src/core/Makefile
trunk/libdom/src/events/Makefile
trunk/libdom/src/html/Makefile
trunk/libdom/src/utils/Makefile
trunk/libdom/test/Makefile
Modified: trunk/libdom/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/Makefile?rev=14005&r1=1400...
==============================================================================
--- trunk/libdom/Makefile (original)
+++ trunk/libdom/Makefile Fri Jun 29 14:55:31 2012
@@ -5,9 +5,11 @@
COMPONENT_TYPE ?= lib-static
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
-TESTRUNNER := $(PERL) build/testtools/testrunner.pl
+TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -41,7 +43,7 @@
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
Is := include/dom
Modified: trunk/libdom/bindings/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/bindings/Makefile?rev=1400...
==============================================================================
--- trunk/libdom/bindings/Makefile (original)
+++ trunk/libdom/bindings/Makefile Fri Jun 29 14:55:31 2012
@@ -1,1 +1,3 @@
-include build/makefiles/Makefile.subdir
+# Bindings
+
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/bindings/hubbub/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/bindings/hubbub/Makefile?r...
==============================================================================
--- trunk/libdom/bindings/hubbub/Makefile (original)
+++ trunk/libdom/bindings/hubbub/Makefile Fri Jun 29 14:55:31 2012
@@ -13,5 +13,5 @@
endif
endif
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/bindings/xml/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/bindings/xml/Makefile?rev=...
==============================================================================
--- trunk/libdom/bindings/xml/Makefile (original)
+++ trunk/libdom/bindings/xml/Makefile Fri Jun 29 14:55:31 2012
@@ -29,5 +29,5 @@
DIR_INSTALL_ITEMS := /include/dom/bindings/libxml:xmlerror.h;xmlparser.h
endif
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/src/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/src/Makefile?rev=14005&r1=...
==============================================================================
--- trunk/libdom/src/Makefile (original)
+++ trunk/libdom/src/Makefile Fri Jun 29 14:55:31 2012
@@ -1,1 +1,3 @@
-include build/makefiles/Makefile.subdir
+# Src
+
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/src/core/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/src/core/Makefile?rev=1400...
==============================================================================
--- trunk/libdom/src/core/Makefile (original)
+++ trunk/libdom/src/core/Makefile Fri Jun 29 14:55:31 2012
@@ -8,4 +8,4 @@
cdatasection.c document_type.c entity_ref.c pi.c \
doc_fragment.c document.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/src/events/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/src/events/Makefile?rev=14...
==============================================================================
--- trunk/libdom/src/events/Makefile (original)
+++ trunk/libdom/src/events/Makefile Fri Jun 29 14:55:31 2012
@@ -4,4 +4,4 @@
text_event.c event_listener.c mouse_event.c mutation_event.c \
ui_event.c mouse_multi_wheel_event.c mutation_name_event.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/src/html/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/src/html/Makefile?rev=1400...
==============================================================================
--- trunk/libdom/src/html/Makefile (original)
+++ trunk/libdom/src/html/Makefile Fri Jun 29 14:55:31 2012
@@ -22,4 +22,4 @@
html_tablecell_element.c html_frameset_element.c html_frame_element.c \
html_iframe_element.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/src/utils/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/src/utils/Makefile?rev=140...
==============================================================================
--- trunk/libdom/src/utils/Makefile (original)
+++ trunk/libdom/src/utils/Makefile Fri Jun 29 14:55:31 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := namespace.c hashtable.c character_valid.c validate.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libdom/test/Makefile
URL: http://source.netsurf-browser.org/trunk/libdom/test/Makefile?rev=14005&r1...
==============================================================================
--- trunk/libdom/test/Makefile (original)
+++ trunk/libdom/test/Makefile Fri Jun 29 14:55:31 2012
@@ -59,5 +59,5 @@
DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) $(DIR)INDEX
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
10 years, 7 months
r14004 dsilvers - in /trunk/libcss: ./ build/ src/ src/bytecode/ src/charset/ src/lex/ src/parse/ src/parse/properties/ src/select/ src/select/properties/ src/utils/ test/
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:55:20 2012
New Revision: 14004
URL: http://source.netsurf-browser.org?rev=14004&view=rev
Log:
Update to new NSBUILD infrastructure
Modified:
trunk/libcss/Makefile
trunk/libcss/build/ (props changed)
trunk/libcss/src/Makefile
trunk/libcss/src/bytecode/Makefile
trunk/libcss/src/charset/Makefile
trunk/libcss/src/lex/Makefile
trunk/libcss/src/parse/Makefile
trunk/libcss/src/parse/properties/Makefile
trunk/libcss/src/select/Makefile
trunk/libcss/src/select/properties/Makefile
trunk/libcss/src/utils/Makefile
trunk/libcss/test/Makefile
Modified: trunk/libcss/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/Makefile?rev=14004&r1=1400...
==============================================================================
--- trunk/libcss/Makefile (original)
+++ trunk/libcss/Makefile Fri Jun 29 14:55:20 2012
@@ -5,9 +5,11 @@
COMPONENT_TYPE ?= lib-static
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
-TESTRUNNER := $(PERL) build/testtools/testrunner.pl
+TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -39,7 +41,7 @@
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
I := /include/libcss
Propchange: trunk/libcss/build/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Jun 29 14:55:20 2012
@@ -1,2 +1,1 @@
-makefiles svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
-testtools svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools
+
Modified: trunk/libcss/src/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/Makefile?rev=14004&r1=...
==============================================================================
--- trunk/libcss/src/Makefile (original)
+++ trunk/libcss/src/Makefile Fri Jun 29 14:55:20 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := stylesheet.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/bytecode/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/bytecode/Makefile?rev=...
==============================================================================
--- trunk/libcss/src/bytecode/Makefile (original)
+++ trunk/libcss/src/bytecode/Makefile Fri Jun 29 14:55:20 2012
@@ -1,3 +1,3 @@
# Sources
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/charset/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/charset/Makefile?rev=1...
==============================================================================
--- trunk/libcss/src/charset/Makefile (original)
+++ trunk/libcss/src/charset/Makefile Fri Jun 29 14:55:20 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := detect.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/lex/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/lex/Makefile?rev=14004...
==============================================================================
--- trunk/libcss/src/lex/Makefile (original)
+++ trunk/libcss/src/lex/Makefile Fri Jun 29 14:55:20 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := lex.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/parse/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/Makefile?rev=140...
==============================================================================
--- trunk/libcss/src/parse/Makefile (original)
+++ trunk/libcss/src/parse/Makefile Fri Jun 29 14:55:20 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := parse.c language.c important.c propstrings.c font_face.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/parse/properties/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/properties/Makef...
==============================================================================
--- trunk/libcss/src/parse/properties/Makefile (original)
+++ trunk/libcss/src/parse/properties/Makefile Fri Jun 29 14:55:20 2012
@@ -68,4 +68,4 @@
DISTCLEAN_ITEMS := $(foreach AP,$(AUTOGEN_PARSERS),src/parse/properties/autogenerated_$(AP).c)
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/select/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/Makefile?rev=14...
==============================================================================
--- trunk/libcss/src/select/Makefile (original)
+++ trunk/libcss/src/select/Makefile Fri Jun 29 14:55:20 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := computed.c dispatch.c hash.c select.c font_face.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/select/properties/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/Make...
==============================================================================
--- trunk/libcss/src/select/properties/Makefile (original)
+++ trunk/libcss/src/select/properties/Makefile Fri Jun 29 14:55:20 2012
@@ -112,4 +112,4 @@
word_spacing.c \
z_index.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/src/utils/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/utils/Makefile?rev=140...
==============================================================================
--- trunk/libcss/src/utils/Makefile (original)
+++ trunk/libcss/src/utils/Makefile Fri Jun 29 14:55:20 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := errors.c utils.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libcss/test/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/test/Makefile?rev=14004&r1...
==============================================================================
--- trunk/libcss/test/Makefile (original)
+++ trunk/libcss/test/Makefile Fri Jun 29 14:55:20 2012
@@ -4,4 +4,4 @@
parse:parse.c parse-auto:parse-auto.c parse2-auto:parse2-auto.c \
select-auto:select-auto.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
10 years, 7 months
r14003 dsilvers - in /trunk/libparserutils: Makefile build/ src/Makefile src/charset/Makefile src/charset/codecs/Makefile src/charset/encodings/Makefile src/input/Makefile src/utils/Makefile test/Makefile test/regression/Makefile
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:55:17 2012
New Revision: 14003
URL: http://source.netsurf-browser.org?rev=14003&view=rev
Log:
Update to new NSBUILD infrastructure
Modified:
trunk/libparserutils/Makefile
trunk/libparserutils/build/ (props changed)
trunk/libparserutils/src/Makefile
trunk/libparserutils/src/charset/Makefile
trunk/libparserutils/src/charset/codecs/Makefile
trunk/libparserutils/src/charset/encodings/Makefile
trunk/libparserutils/src/input/Makefile
trunk/libparserutils/src/utils/Makefile
trunk/libparserutils/test/Makefile
trunk/libparserutils/test/regression/Makefile
Modified: trunk/libparserutils/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/Makefile?rev=14003...
==============================================================================
--- trunk/libparserutils/Makefile (original)
+++ trunk/libparserutils/Makefile Fri Jun 29 14:55:17 2012
@@ -5,9 +5,11 @@
COMPONENT_TYPE ?= lib-static
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
-TESTRUNNER := $(PERL) build/testtools/testrunner.pl
+TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -27,7 +29,7 @@
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
Is := include/parserutils
Propchange: trunk/libparserutils/build/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Jun 29 14:55:17 2012
@@ -1,2 +1,1 @@
-makefiles svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
-testtools svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools
+
Modified: trunk/libparserutils/src/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/Makefile?rev=1...
==============================================================================
--- trunk/libparserutils/src/Makefile (original)
+++ trunk/libparserutils/src/Makefile Fri Jun 29 14:55:17 2012
@@ -1,2 +1,2 @@
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/src/charset/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/charset/Makefi...
==============================================================================
--- trunk/libparserutils/src/charset/Makefile (original)
+++ trunk/libparserutils/src/charset/Makefile Fri Jun 29 14:55:17 2012
@@ -11,4 +11,4 @@
CLEAN_ITEMS := $(CLEAN_ITEMS) $(DIR)aliases.inc
endif
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/src/charset/codecs/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/charset/codecs...
==============================================================================
--- trunk/libparserutils/src/charset/codecs/Makefile (original)
+++ trunk/libparserutils/src/charset/codecs/Makefile Fri Jun 29 14:55:17 2012
@@ -2,4 +2,4 @@
DIR_SOURCES := codec_ascii.c codec_8859.c codec_ext8.c \
codec_utf8.c codec_utf16.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/src/charset/encodings/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/charset/encodi...
==============================================================================
--- trunk/libparserutils/src/charset/encodings/Makefile (original)
+++ trunk/libparserutils/src/charset/encodings/Makefile Fri Jun 29 14:55:17 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := utf8.c utf16.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/src/input/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/input/Makefile...
==============================================================================
--- trunk/libparserutils/src/input/Makefile (original)
+++ trunk/libparserutils/src/input/Makefile Fri Jun 29 14:55:17 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := filter.c inputstream.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/src/utils/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/utils/Makefile...
==============================================================================
--- trunk/libparserutils/src/utils/Makefile (original)
+++ trunk/libparserutils/src/utils/Makefile Fri Jun 29 14:55:17 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := buffer.c errors.c stack.c vector.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/test/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/test/Makefile?rev=...
==============================================================================
--- trunk/libparserutils/test/Makefile (original)
+++ trunk/libparserutils/test/Makefile Fri Jun 29 14:55:17 2012
@@ -4,4 +4,4 @@
cscodec-utf16:cscodec-utf16.c filter:filter.c \
inputstream:inputstream.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libparserutils/test/regression/Makefile
URL: http://source.netsurf-browser.org/trunk/libparserutils/test/regression/Ma...
==============================================================================
--- trunk/libparserutils/test/regression/Makefile (original)
+++ trunk/libparserutils/test/regression/Makefile Fri Jun 29 14:55:17 2012
@@ -4,4 +4,4 @@
CFLAGS := $(CFLAGS) -I$(CURDIR)/test
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
10 years, 7 months
r14002 dsilvers - in /trunk/libwapcaplet: Makefile build/ src/Makefile test/Makefile
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:55:12 2012
New Revision: 14002
URL: http://source.netsurf-browser.org?rev=14002&view=rev
Log:
Update to new NSBUILD infrastructure
Removed:
trunk/libwapcaplet/build/
Modified:
trunk/libwapcaplet/Makefile
trunk/libwapcaplet/src/Makefile
trunk/libwapcaplet/test/Makefile
Modified: trunk/libwapcaplet/Makefile
URL: http://source.netsurf-browser.org/trunk/libwapcaplet/Makefile?rev=14002&r...
==============================================================================
--- trunk/libwapcaplet/Makefile (original)
+++ trunk/libwapcaplet/Makefile Fri Jun 29 14:55:12 2012
@@ -5,7 +5,9 @@
COMPONENT_TYPE ?= lib-static
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Reevaluate when used, as BUILDDIR won't be defined yet
TESTRUNNER = $(BUILDDIR)/test_testrunner$(EXEEXT)
@@ -27,7 +29,7 @@
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
ifeq ($(WANT_TEST),yes)
ifneq ($(PKGCONFIG),)
Modified: trunk/libwapcaplet/src/Makefile
URL: http://source.netsurf-browser.org/trunk/libwapcaplet/src/Makefile?rev=140...
==============================================================================
--- trunk/libwapcaplet/src/Makefile (original)
+++ trunk/libwapcaplet/src/Makefile Fri Jun 29 14:55:12 2012
@@ -1,3 +1,3 @@
DIR_SOURCES := libwapcaplet.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/libwapcaplet/test/Makefile
URL: http://source.netsurf-browser.org/trunk/libwapcaplet/test/Makefile?rev=14...
==============================================================================
--- trunk/libwapcaplet/test/Makefile (original)
+++ trunk/libwapcaplet/test/Makefile Fri Jun 29 14:55:12 2012
@@ -1,3 +1,3 @@
DIR_TEST_ITEMS := testrunner:testmain.c;basictests.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
10 years, 7 months
r14001 dsilvers - /trunk/libparserutils/test/inputstream.c
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:34:28 2012
New Revision: 14001
URL: http://source.netsurf-browser.org?rev=14001&view=rev
Log:
Remove unused origlen so tests run
Modified:
trunk/libparserutils/test/inputstream.c
Modified: trunk/libparserutils/test/inputstream.c
URL: http://source.netsurf-browser.org/trunk/libparserutils/test/inputstream.c...
==============================================================================
--- trunk/libparserutils/test/inputstream.c (original)
+++ trunk/libparserutils/test/inputstream.c Fri Jun 29 14:34:28 2012
@@ -25,7 +25,7 @@
{
parserutils_inputstream *stream;
FILE *fp;
- size_t len, origlen;
+ size_t len;
#define CHUNK_SIZE (4096)
uint8_t buf[CHUNK_SIZE];
const uint8_t *c;
@@ -46,7 +46,7 @@
}
fseek(fp, 0, SEEK_END);
- origlen = len = ftell(fp);
+ len = ftell(fp);
fseek(fp, 0, SEEK_SET);
while (len >= CHUNK_SIZE) {
10 years, 7 months
r14000 dsilvers - /trunk/tools/buildsystem/makefiles/Makefile.tools
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:34:07 2012
New Revision: 14000
URL: http://source.netsurf-browser.org?rev=14000&view=rev
Log:
Use patsubst to ensure trailing / get removed from dirs, so testtools can be found
Modified:
trunk/tools/buildsystem/makefiles/Makefile.tools
Modified: trunk/tools/buildsystem/makefiles/Makefile.tools
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/makefiles/Makef...
==============================================================================
--- trunk/tools/buildsystem/makefiles/Makefile.tools (original)
+++ trunk/tools/buildsystem/makefiles/Makefile.tools Fri Jun 29 14:34:07 2012
@@ -38,8 +38,8 @@
# Determine path used to load us, so we can locate other makefiles etc
###############################################################################
-NSBUILD := $(dir $(lastword $(MAKEFILE_LIST)))
-NSSHARED := $(dir $(NSBUILD))
+NSBUILD := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+NSSHARED := $(patsubst %/,%,$(dir $(NSBUILD)))
NSTESTTOOLS := $(NSSHARED)/testtools
###############################################################################
10 years, 7 months
r13998 dsilvers - in /trunk/tools: alphagen/Makefile alphagen/src/Makefile heapview/Makefile heapview/src/Makefile profile/Makefile profile/src/Makefile trace/Makefile trace/src/Makefile ttf2f/Makefile ttf2f/src/Makefile
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 14:15:59 2012
New Revision: 13998
URL: http://source.netsurf-browser.org?rev=13998&view=rev
Log:
Rework the makefiles in the tools/ tree for the new NSBUILD stuff
Modified:
trunk/tools/alphagen/Makefile
trunk/tools/alphagen/src/Makefile
trunk/tools/heapview/Makefile
trunk/tools/heapview/src/Makefile
trunk/tools/profile/Makefile
trunk/tools/profile/src/Makefile
trunk/tools/trace/Makefile
trunk/tools/trace/src/Makefile
trunk/tools/ttf2f/Makefile
trunk/tools/ttf2f/src/Makefile
Modified: trunk/tools/alphagen/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/alphagen/Makefile?rev=13998...
==============================================================================
--- trunk/tools/alphagen/Makefile (original)
+++ trunk/tools/alphagen/Makefile Fri Jun 29 14:15:59 2012
@@ -9,7 +9,9 @@
COMPONENT_VERSION := 1.0.0
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -23,6 +25,6 @@
endif
# Grab the core makefile
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
Modified: trunk/tools/alphagen/src/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/alphagen/src/Makefile?rev=1...
==============================================================================
--- trunk/tools/alphagen/src/Makefile (original)
+++ trunk/tools/alphagen/src/Makefile Fri Jun 29 14:15:59 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := alphagen.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/heapview/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/heapview/Makefile?rev=13998...
==============================================================================
--- trunk/tools/heapview/Makefile (original)
+++ trunk/tools/heapview/Makefile Fri Jun 29 14:15:59 2012
@@ -5,7 +5,9 @@
COMPONENT_TYPE := binary
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
@@ -22,7 +24,7 @@
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
Modified: trunk/tools/heapview/src/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/heapview/src/Makefile?rev=1...
==============================================================================
--- trunk/tools/heapview/src/Makefile (original)
+++ trunk/tools/heapview/src/Makefile Fri Jun 29 14:15:59 2012
@@ -1,3 +1,3 @@
DIR_SOURCES := heap.cpp main.cpp ui.cpp
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/profile/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/profile/Makefile?rev=13998&...
==============================================================================
--- trunk/tools/profile/Makefile (original)
+++ trunk/tools/profile/Makefile Fri Jun 29 14:15:59 2012
@@ -5,7 +5,9 @@
COMPONENT_TYPE ?= lib-static
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
@@ -23,7 +25,7 @@
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
Modified: trunk/tools/profile/src/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/profile/src/Makefile?rev=13...
==============================================================================
--- trunk/tools/profile/src/Makefile (original)
+++ trunk/tools/profile/src/Makefile Fri Jun 29 14:15:59 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := profc.c profile.s
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/trace/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/trace/Makefile?rev=13998&r1...
==============================================================================
--- trunk/tools/trace/Makefile (original)
+++ trunk/tools/trace/Makefile Fri Jun 29 14:15:59 2012
@@ -5,7 +5,9 @@
COMPONENT_TYPE ?= lib-static
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
@@ -23,7 +25,7 @@
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
Modified: trunk/tools/trace/src/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/trace/src/Makefile?rev=1399...
==============================================================================
--- trunk/tools/trace/src/Makefile (original)
+++ trunk/tools/trace/src/Makefile Fri Jun 29 14:15:59 2012
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := shim.s trace.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/ttf2f/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/ttf2f/Makefile?rev=13998&r1...
==============================================================================
--- trunk/tools/ttf2f/Makefile (original)
+++ trunk/tools/ttf2f/Makefile Fri Jun 29 14:15:59 2012
@@ -8,7 +8,9 @@
FRONTEND ?= cli
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
@@ -41,7 +43,7 @@
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
Modified: trunk/tools/ttf2f/src/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/ttf2f/src/Makefile?rev=1399...
==============================================================================
--- trunk/tools/ttf2f/src/Makefile (original)
+++ trunk/tools/ttf2f/src/Makefile Fri Jun 29 14:15:59 2012
@@ -9,4 +9,4 @@
endif
endif
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
10 years, 7 months
r13997 dsilvers - in /trunk/tools/buildsystem: example/Makefile makefiles/Makefile.tools
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 13:24:26 2012
New Revision: 13997
URL: http://source.netsurf-browser.org?rev=13997&view=rev
Log:
Allow Makefile.tools to find the test tools etc, and use NSSHARED as the root of everything
Modified:
trunk/tools/buildsystem/example/Makefile
trunk/tools/buildsystem/makefiles/Makefile.tools
Modified: trunk/tools/buildsystem/example/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/example/Makefil...
==============================================================================
--- trunk/tools/buildsystem/example/Makefile (original)
+++ trunk/tools/buildsystem/example/Makefile Fri Jun 29 13:24:26 2012
@@ -6,7 +6,9 @@
COMPONENT_VERSION := 0.0.1
# Tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Grab the core makefile
include $(NSBUILD)/Makefile.top
Modified: trunk/tools/buildsystem/makefiles/Makefile.tools
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/makefiles/Makef...
==============================================================================
--- trunk/tools/buildsystem/makefiles/Makefile.tools (original)
+++ trunk/tools/buildsystem/makefiles/Makefile.tools Fri Jun 29 13:24:26 2012
@@ -35,10 +35,12 @@
endif
###############################################################################
-# Determine path used to load us, so we can locate other makefiles
+# Determine path used to load us, so we can locate other makefiles etc
###############################################################################
NSBUILD := $(dir $(lastword $(MAKEFILE_LIST)))
+NSSHARED := $(dir $(NSBUILD))
+NSTESTTOOLS := $(NSSHARED)/testtools
###############################################################################
# Host/target platform detection
10 years, 7 months
r13996 dsilvers - in /trunk/tools/buildsystem: example/Makefile example/src1/Makefile example/src2/Makefile example/test/Makefile example/test2/Makefile makefiles/Makefile.tools
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Jun 29 13:17:04 2012
New Revision: 13996
URL: http://source.netsurf-browser.org?rev=13996&view=rev
Log:
Initial rework to have Makefile.tools find itself and set NSBUILD
Modified:
trunk/tools/buildsystem/example/Makefile
trunk/tools/buildsystem/example/src1/Makefile
trunk/tools/buildsystem/example/src2/Makefile
trunk/tools/buildsystem/example/test/Makefile
trunk/tools/buildsystem/example/test2/Makefile
trunk/tools/buildsystem/makefiles/Makefile.tools
Modified: trunk/tools/buildsystem/example/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/example/Makefil...
==============================================================================
--- trunk/tools/buildsystem/example/Makefile (original)
+++ trunk/tools/buildsystem/example/Makefile Fri Jun 29 13:17:04 2012
@@ -9,7 +9,7 @@
include build/makefiles/Makefile.tools
# Grab the core makefile
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Add extra install rules for our pkg-config control file and the library itself
INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
Modified: trunk/tools/buildsystem/example/src1/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/example/src1/Ma...
==============================================================================
--- trunk/tools/buildsystem/example/src1/Makefile (original)
+++ trunk/tools/buildsystem/example/src1/Makefile Fri Jun 29 13:17:04 2012
@@ -4,4 +4,4 @@
DIR_INSTALL_ITEMS := /include:foo.h
# Grab the core makefile
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/buildsystem/example/src2/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/example/src2/Ma...
==============================================================================
--- trunk/tools/buildsystem/example/src2/Makefile (original)
+++ trunk/tools/buildsystem/example/src2/Makefile Fri Jun 29 13:17:04 2012
@@ -1,4 +1,4 @@
# Sources in this directory
DIR_SOURCES := bar.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/buildsystem/example/test/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/example/test/Ma...
==============================================================================
--- trunk/tools/buildsystem/example/test/Makefile (original)
+++ trunk/tools/buildsystem/example/test/Makefile Fri Jun 29 13:17:04 2012
@@ -1,4 +1,4 @@
# Test sources in this directory
DIR_TEST_SOURCES := foo.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/buildsystem/example/test2/Makefile
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/example/test2/M...
==============================================================================
--- trunk/tools/buildsystem/example/test2/Makefile (original)
+++ trunk/tools/buildsystem/example/test2/Makefile Fri Jun 29 13:17:04 2012
@@ -1,4 +1,4 @@
# Test sources in this directory
DIR_TEST_SOURCES := foo.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/tools/buildsystem/makefiles/Makefile.tools
URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/makefiles/Makef...
==============================================================================
--- trunk/tools/buildsystem/makefiles/Makefile.tools (original)
+++ trunk/tools/buildsystem/makefiles/Makefile.tools Fri Jun 29 13:17:04 2012
@@ -35,6 +35,12 @@
endif
###############################################################################
+# Determine path used to load us, so we can locate other makefiles
+###############################################################################
+
+NSBUILD := $(dir $(lastword $(MAKEFILE_LIST)))
+
+###############################################################################
# Host/target platform detection
###############################################################################
@@ -415,7 +421,7 @@
endif
# TODO: It would be nice to avoid this hard-coded path
-include build/makefiles/Makefile.$(toolchain)
+include $(NSBUILD)/Makefile.$(toolchain)
###############################################################################
# Default assembler/compiler/linker/archiver flags
@@ -468,4 +474,4 @@
# Package config macros
################################################################################
-include build/makefiles/Makefile.pkgconfig
+include $(NSBUILD)/Makefile.pkgconfig
10 years, 7 months