diff options
author | Vincent Sanders <vince@kyllikki.org> | 2020-06-22 10:49:34 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2020-06-27 23:30:54 +0100 |
commit | 421d796e9b462939de9e9e116e09e9384a8ba5bc (patch) | |
tree | 4b74bebbfa11814c6b58b03e6c45e93cd621b838 | |
parent | 1dab82d655b8f54e344f21f062495d5cb35c8c4c (diff) | |
download | netsurf-421d796e9b462939de9e9e116e09e9384a8ba5bc.tar.gz netsurf-421d796e9b462939de9e9e116e09e9384a8ba5bc.tar.bz2 |
split tools and utils
-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | frontends/riscos/Makefile | 2 | ||||
-rw-r--r-- | tools/DerivedJoiningType.txt (renamed from utils/DerivedJoiningType.txt) | 0 | ||||
-rw-r--r-- | tools/Makefile | 75 | ||||
-rw-r--r-- | tools/convert_font.c (renamed from utils/convert_font.c) | 0 | ||||
-rw-r--r-- | tools/convert_image.c (renamed from utils/convert_image.c) | 0 | ||||
-rwxr-xr-x | tools/coverity-build.sh (renamed from utils/coverity-build.sh) | 0 | ||||
-rw-r--r-- | tools/fetch-transifex.pl (renamed from utils/fetch-transifex.pl) | 0 | ||||
-rwxr-xr-x | tools/git-date.sh (renamed from utils/git-date.sh) | 0 | ||||
-rw-r--r-- | tools/git-testament.pl (renamed from utils/git-testament.pl) | 0 | ||||
-rw-r--r-- | tools/idna-derived-props-gen.pl (renamed from utils/idna-derived-props-gen.pl) | 0 | ||||
-rw-r--r-- | tools/idna-tables-properties.csv (renamed from utils/idna-tables-properties.csv) | 0 | ||||
-rw-r--r-- | tools/import-messages.pl (renamed from utils/import-messages.pl) | 0 | ||||
-rwxr-xr-x | tools/jenkins-build.sh (renamed from utils/jenkins-build.sh) | 0 | ||||
-rwxr-xr-x | tools/memanalyze.pl (renamed from utils/memanalyze.pl) | 0 | ||||
-rw-r--r-- | tools/split-messages.c (renamed from utils/split-messages.c) | 2 | ||||
-rw-r--r-- | tools/split-messages.pl (renamed from utils/split-messages.pl) | 0 | ||||
-rwxr-xr-x | tools/test-netsurf (renamed from utils/test-netsurf) | 0 | ||||
-rw-r--r-- | tools/valgrind.supp (renamed from utils/valgrind.supp) | 0 | ||||
-rw-r--r-- | tools/xxd.c (renamed from utils/xxd.c) | 0 | ||||
-rw-r--r-- | utils/Makefile | 64 |
21 files changed, 84 insertions, 74 deletions
@@ -638,6 +638,12 @@ POSTEXES := include frontends/Makefile # ---------------------------------------------------------------------------- +# Build tools setup +# ---------------------------------------------------------------------------- + +include tools/Makefile + +# ---------------------------------------------------------------------------- # General source file setup # ---------------------------------------------------------------------------- @@ -743,10 +749,6 @@ clean-target: $(Q)$(RM) $(EXETARGET) CLEANS += clean-target -clean-testament: - $(VQ)echo " CLEAN: testament.h" - $(Q)$(RM) $(OBJROOT)/testament.h -CLEANS += clean-testament clean-builddir: $(VQ)echo " CLEAN: $(OBJROOT)" @@ -754,10 +756,7 @@ clean-builddir: CLEANS += clean-builddir -.PHONY: all-program testament - -testament $(OBJROOT)/testament.h: - $(Q)$(PERL) utils/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h +.PHONY: all-program all-program: $(EXETARGET) $(POSTEXES) diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile index c028ed789..af6585c46 100644 --- a/frontends/riscos/Makefile +++ b/frontends/riscos/Makefile @@ -178,7 +178,7 @@ netsurf.zip: $(EXETARGET) $(eval $@_TMPDIR := $(shell mktemp -d)) $(Q) $(RM) $@ $(Q) cp -rLvp $(FRONTEND_SOURCE_DIR)/appdir $($@_TMPDIR)/!NetSurf - $(Q) $(CURDIR)/utils/git-date.sh $(FRONTEND_SOURCE_DIR)/distribution + $(Q) $(CURDIR)/tools/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) $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/3rdParty $($@_TMPDIR) diff --git a/utils/DerivedJoiningType.txt b/tools/DerivedJoiningType.txt index d4dcc85f6..d4dcc85f6 100644 --- a/utils/DerivedJoiningType.txt +++ b/tools/DerivedJoiningType.txt diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 000000000..5dc4a1000 --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,75 @@ +# Tools + +# testament rules + +clean-testament: + $(VQ)echo " CLEAN: testament.h" + $(Q)$(RM) $(OBJROOT)/testament.h +CLEANS += clean-testament + +.PHONY: testament + +testament $(OBJROOT)/testament.h: + $(Q)$(PERL) tools/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h + + +# lib png build compiler flags +ifeq ($(HOST),OpenBSD) + BUILD_LIBPNG_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpng) + BUILD_LIBPNG_LDFLAGS += $(shell $(PKG_CONFIG) --libs libpng) +else + ifeq ($(HOST),FreeBSD) + BUILD_LIBPNG_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpng) + BUILD_LIBPNG_LDFLAGS += $(shell $(PKG_CONFIG) --libs libpng) + else + BUILD_LIBPNG_CFLAGS += + BUILD_LIBPNG_LDFLAGS += -lpng + endif +endif + + +# Build tool to convert file to comiled data +# +$(TOOLROOT)/xxd: tools/xxd.c $(TOOLROOT)/created + $(VQ)echo "BUILD CC: $@" + $(Q)$(BUILD_CC) $(BUILD_CFLAGS) -o $@ $< $(BUILD_LDFLAGS) + + +# Build tool to filter messages +# +$(TOOLROOT)/split-messages: tools/split-messages.c $(TOOLROOT)/created + $(VQ)echo "BUILD CC: $@" + $(Q)$(BUILD_CC) $(BUILD_CFLAGS) -I. -o $@ $< $(BUILD_LDFLAGS) -lz + + +# Build tool to convert image bitmaps to source code. +# +$(TOOLROOT)/convert_image: tools/convert_image.c $(TOOLROOT)/created + $(VQ)echo "BUILD CC: $@" + $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LIBPNG_CFLAGS) -o $@ $< $(BUILD_LDFLAGS) $(BUILD_LIBPNG_LDFLAGS) + + +# Build too to perform font conversion +$(TOOLROOT)/convert_font: tools/convert_font.c $(TOOLROOT)/created + $(VQ)echo "BUILD CC: $@" + $(Q)$(BUILD_CC) $(BUILD_CFLAGS) -o $@ $< + +# idna +# +IDNA_UNICODE_MAJOR=11 + +tools/DerivedJoiningType.txt: + curl -o $@ "https://www.unicode.org/Public/$(IDNA_UNICODE_MAJOR).0.0/ucd/extracted/DerivedJoiningType.txt" + +tools/IdnaMappingTable.txt: + curl -o $@ "https://www.unicode.org/Public/idna/$(IDNA_UNICODE_MAJOR).0.0/IdnaMappingTable.txt" + +tools/idna-tables-properties.csv: + curl -o $@ "https://www.iana.org/assignments/idna-tables-$(IDNA_UNICODE_MAJOR).0.0/idna-tables-properties.csv" + +# the idna props header must be explicitly rebuilt +ifneq ($(filter $(MAKECMDGOALS),utils/idna_props.h),) +utils/idna_props.h: tools/DerivedJoiningType.txt tools/idna-tables-properties.csv + $(VQ)echo " IDNA: $@" + $(Q)$(PERL) tools/idna-derived-props-gen.pl -o $@ -p tools/idna-tables-properties.csv -j tools/DerivedJoiningType.txt +endif diff --git a/utils/convert_font.c b/tools/convert_font.c index 9f5734b71..9f5734b71 100644 --- a/utils/convert_font.c +++ b/tools/convert_font.c diff --git a/utils/convert_image.c b/tools/convert_image.c index de772fc29..de772fc29 100644 --- a/utils/convert_image.c +++ b/tools/convert_image.c diff --git a/utils/coverity-build.sh b/tools/coverity-build.sh index 24dafd16a..24dafd16a 100755 --- a/utils/coverity-build.sh +++ b/tools/coverity-build.sh diff --git a/utils/fetch-transifex.pl b/tools/fetch-transifex.pl index 4d40062c9..4d40062c9 100644 --- a/utils/fetch-transifex.pl +++ b/tools/fetch-transifex.pl diff --git a/utils/git-date.sh b/tools/git-date.sh index d9a9059a0..d9a9059a0 100755 --- a/utils/git-date.sh +++ b/tools/git-date.sh diff --git a/utils/git-testament.pl b/tools/git-testament.pl index 5a71a16df..5a71a16df 100644 --- a/utils/git-testament.pl +++ b/tools/git-testament.pl diff --git a/utils/idna-derived-props-gen.pl b/tools/idna-derived-props-gen.pl index a9e9b4b53..a9e9b4b53 100644 --- a/utils/idna-derived-props-gen.pl +++ b/tools/idna-derived-props-gen.pl diff --git a/utils/idna-tables-properties.csv b/tools/idna-tables-properties.csv index a74547bc9..a74547bc9 100644 --- a/utils/idna-tables-properties.csv +++ b/tools/idna-tables-properties.csv diff --git a/utils/import-messages.pl b/tools/import-messages.pl index 4c13a859e..4c13a859e 100644 --- a/utils/import-messages.pl +++ b/tools/import-messages.pl diff --git a/utils/jenkins-build.sh b/tools/jenkins-build.sh index d31b233b4..d31b233b4 100755 --- a/utils/jenkins-build.sh +++ b/tools/jenkins-build.sh diff --git a/utils/memanalyze.pl b/tools/memanalyze.pl index 57e107d11..57e107d11 100755 --- a/utils/memanalyze.pl +++ b/tools/memanalyze.pl diff --git a/utils/split-messages.c b/tools/split-messages.c index 581151485..0bce7397f 100644 --- a/utils/split-messages.c +++ b/tools/split-messages.c @@ -11,7 +11,7 @@ #include <string.h> #include <zlib.h> -#include "errors.h" +#include "utils/errors.h" enum out_fmt { OUTPUTFMT_NONE = 0, diff --git a/utils/split-messages.pl b/tools/split-messages.pl index 0504b24c1..0504b24c1 100644 --- a/utils/split-messages.pl +++ b/tools/split-messages.pl diff --git a/utils/test-netsurf b/tools/test-netsurf index 90c7e121b..90c7e121b 100755 --- a/utils/test-netsurf +++ b/tools/test-netsurf diff --git a/utils/valgrind.supp b/tools/valgrind.supp index f1a27f4b4..f1a27f4b4 100644 --- a/utils/valgrind.supp +++ b/tools/valgrind.supp diff --git a/utils/xxd.c b/tools/xxd.c index a4e5dac5b..a4e5dac5b 100644 --- a/utils/xxd.c +++ b/tools/xxd.c diff --git a/utils/Makefile b/utils/Makefile index a0b73d72b..b186cd116 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -24,67 +24,3 @@ S_UTILS := \ utils.c S_UTILS := $(addprefix utils/,$(S_UTILS)) - - -# lib png build compiler flags -ifeq ($(HOST),OpenBSD) - BUILD_LIBPNG_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpng) - BUILD_LIBPNG_LDFLAGS += $(shell $(PKG_CONFIG) --libs libpng) -else - ifeq ($(HOST),FreeBSD) - BUILD_LIBPNG_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpng) - BUILD_LIBPNG_LDFLAGS += $(shell $(PKG_CONFIG) --libs libpng) - else - BUILD_LIBPNG_CFLAGS += - BUILD_LIBPNG_LDFLAGS += -lpng - endif -endif - - -# Build tool to convert file to comiled data -# -$(TOOLROOT)/xxd: utils/xxd.c $(TOOLROOT)/created - $(VQ)echo "BUILD CC: $@" - $(Q)$(BUILD_CC) $(BUILD_CFLAGS) -o $@ $< $(BUILD_LDFLAGS) - - -# Build tool to filter messages -# -$(TOOLROOT)/split-messages: utils/split-messages.c $(TOOLROOT)/created - $(VQ)echo "BUILD CC: $@" - $(Q)$(BUILD_CC) $(BUILD_CFLAGS) -o $@ $< $(BUILD_LDFLAGS) -lz - - -# Build tool to convert image bitmaps to source code. -# -$(TOOLROOT)/convert_image: utils/convert_image.c $(TOOLROOT)/created - $(VQ)echo "BUILD CC: $@" - $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LIBPNG_CFLAGS) -o $@ $< $(BUILD_LDFLAGS) $(BUILD_LIBPNG_LDFLAGS) - - -# Build too to perform font conversion -# -$(TOOLROOT)/convert_font: utils/convert_font.c $(TOOLROOT)/created - $(VQ)echo "BUILD CC: $@" - $(Q)$(BUILD_CC) $(BUILD_CFLAGS) -o $@ $< - - -# idna -# -IDNA_UNICODE_MAJOR=11 - -utils/DerivedJoiningType.txt: - curl -o $@ "https://www.unicode.org/Public/$(IDNA_UNICODE_MAJOR).0.0/ucd/extracted/DerivedJoiningType.txt" - -utils/IdnaMappingTable.txt: - curl -o $@ "https://www.unicode.org/Public/idna/$(IDNA_UNICODE_MAJOR).0.0/IdnaMappingTable.txt" - -utils/idna-tables-properties.csv: - curl -o $@ "https://www.iana.org/assignments/idna-tables-$(IDNA_UNICODE_MAJOR).0.0/idna-tables-properties.csv" - -# the idna props header must be explicitly rebuilt -ifneq ($(filter $(MAKECMDGOALS),utils/idna_props.h),) -utils/idna_props.h: utils/DerivedJoiningType.txt utils/idna-tables-properties.csv - $(VQ)echo " IDNA: $@" - $(Q)$(PERL) utils/idna-derived-props-gen.pl -o $@ -p utils/idna-tables-properties.csv -j utils/DerivedJoiningType.txt -endif |