diff options
-rw-r--r-- | Makefile | 18 | ||||
m--------- | buildsystem | 0 | ||||
m--------- | libcss | 0 | ||||
m--------- | libdom | 0 | ||||
m--------- | libsvgtiny | 0 | ||||
m--------- | netsurf | 0 | ||||
m--------- | nsgenbind | 0 |
7 files changed, 13 insertions, 5 deletions
@@ -4,7 +4,7 @@ # Component settings COMPONENT := netsurf-all -COMPONENT_VERSION := 3.1 +COMPONENT_VERSION := 3.2 # Targets @@ -26,9 +26,12 @@ NSLIB_RO_TARG := librufl libpencil # Build Environment export TARGET ?= gtk -export PKG_CONFIG_PATH = $(TMP_PREFIX)/lib/pkgconfig TMP_PREFIX := $(CURDIR)/inst-$(TARGET) +export PKG_CONFIG_PATH = $(TMP_PREFIX)/lib/pkgconfig +export PATH := $(PATH):$(TMP_PREFIX)/bin/ HOST := $(shell uname -s) +TMP_NSSHARED := $(CURDIR)/buildsystem + # only build what we require for the target ifeq ($(TARGET),riscos) @@ -60,17 +63,17 @@ else endif endif -.PHONY: build install clean release-checkout dist +.PHONY: build install clean release-checkout head-checkout dist # clean macro for each sub target define do_clean - $(MAKE) distclean --directory=$1 TARGET=$(TARGET) + $(MAKE) distclean --directory=$1 TARGET=$(TARGET) NSSHARED=$(TMP_NSSHARED) endef # clean macro for each host sub target define do_host_clean - $(MAKE) distclean --directory=$1 TARGET=$(HOST) + $(MAKE) distclean --directory=$1 TARGET=$(HOST) NSSHARED=$(TMP_NSSHARED) endef @@ -110,8 +113,13 @@ clean: $(MAKE) clean --directory=$(NETSURF_TARG) TARGET=$(TARGET) release-checkout: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG) $(NSLIB_RO_TARG) + git pull --recurse-submodules for x in $^; do cd $$x; (git checkout origin/HEAD && git checkout $$(git describe --abbrev=0 --match="release/*" )); cd ..; done +head-checkout: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG) $(NSLIB_RO_TARG) + git pull --recurse-submodules + for x in $^; do cd $$x; git checkout origin/HEAD ; cd ..; done + dist: $(eval GIT_TAG := $(shell git describe --abbrev=0 --match "release/*")) $(eval GIT_VER := $(shell x="$(GIT_TAG)"; echo "$${x#release/}")) diff --git a/buildsystem b/buildsystem -Subproject 4110cc7c8d38670c79793ea14de37a96887a768 +Subproject b07864e66a48adfab83052db94c962a261a53eb diff --git a/libcss b/libcss -Subproject 89a4d061a46490d5fad3792a565a1a0114c400e +Subproject 1f7f45c3e940c7958cc0e4624c8bf1501690b17 diff --git a/libdom b/libdom -Subproject db5517f4e24d0e7c39a405ce1b363c887196784 +Subproject 13cfd516e469abe4eb64654029b007e178c08ee diff --git a/libsvgtiny b/libsvgtiny -Subproject 7ef85fcc24ca9220427d0276a7b60ed8ba40ff9 +Subproject 4e4c0d2c2abb1e576aa91791ae660bc8f2b9c77 diff --git a/netsurf b/netsurf -Subproject ddc5a52693206b60aba3aaeacecb3d8e2b15103 +Subproject 2d2c6b67cf44c9eef852f0cec13217eb1ad9dca diff --git a/nsgenbind b/nsgenbind -Subproject 0ed60782f8b7abc027d8c8927143b39a7436c10 +Subproject 36abd984e886ab9e1c953410516d20e2bf2d48c |