diff --git a/.cproject b/.cproject
new file mode 100644
index 0000000..28b2dfe
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.project b/.project
new file mode 100644
index 0000000..997ccb1
--- /dev/null
+++ b/.project
@@ -0,0 +1,27 @@
+
+
+ web-fuse
+
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.core.ccnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
new file mode 100644
index 0000000..e916e4f
--- /dev/null
+++ b/.settings/language.settings.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs
new file mode 100644
index 0000000..b2821d3
--- /dev/null
+++ b/.settings/org.eclipse.cdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/BUILDTARGET/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/BUILDTARGET/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/BUILDTARGET/value=amd64-ubuntu-builder
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/BUILDVERBOSE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/BUILDVERBOSE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/BUILDVERBOSE/value=1
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/NINJA_STATUS/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/NINJA_STATUS/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/NINJA_STATUS/value=
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/append=true
+environment/project/cdt.managedbuild.toolchain.gnu.base.2091678410/appendContributed=true
diff --git a/Makefile b/Makefile
index 3afe7b9..45dca17 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,12 @@ default: all
export SOURCE_DATE_EPOCH ?= $(shell $(PROJECT_ROOT)/build/get_source_date_epoch.sh)
export BUILDTIME ?= $(shell date -u -d '@$(SOURCE_DATE_EPOCH)' --rfc-3339 ns 2>/dev/null | sed -e 's/ /T/')
-VERBOSE ?=
-MARCH ?=
+VERBOSE ?=
+BUILDVERBOSE ?=
+BUILDTARGET ?=
+MARCH ?= $(call march,$(BUILDTARGET))
-PROJECT_NAME ?= webfs
+PROJECT_NAME ?= webfuse
PROJECT_ROOT ?= .
VERSION ?= $(shell cat $(PROJECT_ROOT)/VERSION)
OUT ?= $(PROJECT_ROOT)/.build
@@ -22,7 +24,12 @@ DOCKER_BUILDKIT ?=
CONTAINER_USER ?= $(UID)
CONTAINER_GROUP ?= $(shell id -g)
-CONTAINER_WORKSPACE ?= /workspace
+
+PORTABLE_WORSPACE ?=
+CONTAINER_PROJECT_ROOT ?= /workspace/src
+CONTAINER_OUT ?= /workspace/out
+$(PORTABLE_WORSPACE)CONTAINER_PROJECT_ROOT = $(abspath $(PROJECT_ROOT))
+$(PORTABLE_WORSPACE)CONTAINER_OUT = $(abspath $(OUT))
UBUNTU_CODENAME ?= bionic
@@ -54,6 +61,11 @@ $(OUT)/docker/qemu-arm-static-$(QEMU_VERSION): URL := https://github.com/multiar
# Architecture-specific rule target configuration
+march = $(shell echo '$1' | sed -n -e 's@\([^-]*\)-.*@\1@p')
+
+TARGETS += $(BUILDTARGET)
+MARCH := $(MARCH)
+
MARCH_AMD64 := $(filter-out amd64,$(MARCH))
$(MARCH_AMD64)MARCHS += amd64
$(MARCH_AMD64)TARGETS += amd64-ubuntu-builder
@@ -76,7 +88,10 @@ $(addprefix $(OUT)/docker/,$(UBUNTU_TARGETS)): CODENAME := $(UBUNTU_CODENAME)
MAKEFLAGS += $(PARALLELMFLAGS) --no-builtin-rules
-CMAKEFLAGS += -GNinja
+CMAKEFLAGS += '-GNinja'
+
+BUILDSILENT := $(if $(BUILDVERBOSE),,1)
+$(BUILDSILENT)NINJAFLAGS += -v
DOCKER_RUNFLAGS += --interactive
DOCKER_RUNFLAGS += --rm
@@ -85,11 +100,13 @@ DOCKER_RUNFLAGS += --user $(CONTAINER_USER):$(CONTAINER_GROUP)
DOCKER_RUNFLAGS += --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
DOCKER_RUNFLAGS += --env SOURCE_DATE_EPOCH
DOCKER_RUNFLAGS += --env BUILDTIME
+DOCKER_RUNFLAGS += --env NINJA_STATUS
DOCKER_BUILDARGS += CODENAME=$(CODENAME)
DOCKER_BUILDARGS += PARALLELMFLAGS=$(PARALLELMFLAGS)
DOCKER_BUILDARGS += USERID=$(UID)
-DOCKER_BUILDARGS += WORKSPACE=$(CONTAINER_WORKSPACE)
+DOCKER_BUILDARGS += PROJECT_ROOT=$(CONTAINER_PROJECT_ROOT)
+DOCKER_BUILDARGS += OUT=$(CONTAINER_OUT)
DOCKER_BUILDFLAGS += --rm
DOCKER_BUILDFLAGS += $(addprefix --build-arg ,$(DOCKER_BUILDARGS))
@@ -102,15 +119,10 @@ OUT_DIRS += $(addprefix $(OUT)/,$(TARGETS))
BUILD_TARGETS += $(addprefix build-,$(TARGETS))
CHECK_TARGETS += $(addprefix check-,$(TARGETS))
EXTRACT_TARGETS += $(patsubst $(OUT)/%.tar.gz,$(OUT)/src/%,$(FETCH_TARGETS))
+DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(TARGETS))
RULE_TARGETS = $(addprefix $(OUT)/,$(addsuffix /rules.mk,$(TARGETS)))
-BUILD_TARGETS := $(BUILD_TARGETS)
-CHECK_TARGETS := $(CHECK_TARGETS)
-MEMCHECK_TARGETS := $(MEMCHECK_TARGETS)
-CONTAINER_GROUP := $(CONTAINER_GROUP)
-VERSION := $(VERSION)
-PROJECT_ROOT := $(PROJECT_ROOT)
-OUT := $(OUT)
+TARGETS := $(sort $(TARGETS))
# Macros
@@ -118,32 +130,58 @@ echo_if_silent = VERBOSE=1
$(VERBOSE)echo_if_silent = echo $1
$(VERBOSE)SILENT := @
-image_rule = $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; $$(call image,$1)
+container_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \
+ --volume '$(realpath $(PROJECT_ROOT)):$(CONTAINER_PROJECT_ROOT)' \
+ --volume '$(realpath $(OUT)/$1):$(CONTAINER_OUT)/$1' \
+ --workdir '$(CONTAINER_OUT)/$1' \
+ $(PROJECT_NAME)-$1:$(VERSION) \
+ $2
+
+image_rule = \
+ $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \
+ $$(call image,$1)
image = $(SILENT) \
$(call echo_if_silent,docker build $(PROJECT_NAME)-$1:$(VERSION) $(OUT)) \
&& $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(PROJECT_NAME)-$1:$(VERSION) $(OUT)
-run_rule = run-$1: $$(OUT)/docker/$1; $$(call run,$1,/bin/bash,--tty)
-run = $(SILENT) \
- $(call echo_if_silent,TARGET=$1 $2) \
- && $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \
- --volume '$(realpath $(PROJECT_ROOT)):$(CONTAINER_WORKSPACE)' \
- --volume '$(realpath $(OUT)/$1):$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
- --workdir '$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
- $(PROJECT_NAME)-$1:$(VERSION) \
- $2
+run_rule = \
+ run-$1: $$(OUT)/docker/$1; \
+ $$(call run_recipe,$1,/bin/bash,--tty)
+run = $(call echo_if_silent,TARGET=$1 $2) && $(call container_run,$1,$2,$3)
+run_recipe = $(SILENT)$(call run,$1,$2,$3)
-configure_rule = $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; $$(call configure,$1)
-configure = $(call run,$1,cmake $(CMAKEFLAGS) ..) && touch $@
+configure_rule = \
+ $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \
+ $$(call configure,$1)
+configure = $(SILENT) \
+ $(call run,$1,sh -c 'cmake $(CMAKEFLAGS) $(CONTAINER_PROJECT_ROOT) && $(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $@)') \
+ && touch $@
-build_rule = build-$1: $$(OUT)/$1/CMakeCache.txt; $$(call build,$1)
-build = $(call run,$1,ninja $(PARALLELMFLAGS) $(GLOAS))
+build_rule = \
+ build-$1: $$(OUT)/$1/CMakeCache.txt; \
+ $$(call build,$1)
+build = $(SILENT)$(call run,$1,ninja $(PARALLELMFLAGS) $(NINJAFLAGS) $(GLOAS))
-check_rule = check-$1: build-$1; $$(call check,$1)
-check = $(call run,$1,ctest $(CTESTFLAGS))
+check_rule = \
+ check-$1: build-$1; \
+ $$(call check,$1)
+check = $(SILENT)$(call run,$1,ctest $(CTESTFLAGS))
-memcheck_rule = memcheck-$1: build-$1; $$(call memcheck,$1)
-memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS))
+memcheck_rule = \
+ memcheck-$1: build-$1; \
+ $$(call memcheck,$1)
+memcheck = $(SILENT)$(call run,$1,ctest -T memcheck $(CTESTFLAGS))
+
+discover_cc_settings_rule = \
+ $$(OUT)/$1/include_dirs.txt: $$(OUT)/$1/CMakeCache.txt; \
+ $$(call discover_cc_settings,$1)
+discover_cc_settings = $(SILENT) \
+ $(call run,$1,$(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $<)) \
+
+discover_cc_rule = \
+ discover-cc-$1: $$(OUT)/$1/include_dirs.txt; \
+ $$(call discover_cc,$1)
+discover_cc = $(SILENT)cat $<
# Rules
@@ -166,6 +204,10 @@ $(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS)
echo '$(call memcheck_rule,$(TARGET))'; \
echo; \
echo '$(call run_rule,$(TARGET))'; \
+ echo; \
+ echo '$(call discover_cc_settings_rule,$(TARGET))'; \
+ echo; \
+ echo '$(call discover_cc_rule,$(TARGET))'; \
} > $@
.PHONY: all
@@ -184,6 +226,9 @@ clean: $(CLEAN_TARGETS)
.PHONY: get-deps
get-deps: $(EXTRACT_TARGETS)
+.PHONY: discover-cc
+discover-cc: $(DISCOVER_CC_TARGETS)
+
.PHONY: debug-print-%
debug-print-%:
@printf '%s\n' '$*:' $($*)
@@ -211,6 +256,3 @@ $(OUT)/src/%: $(OUT)/%.tar.gz | $(OUT_DIRS)
$(OUT_DIRS):
$(SILENT)mkdir -p $@
-.PRECIOUS: $(OUT)/docker/% $(OUT)/%/CMakeCache.txt
-.DELETE_ON_ERROR: $(OUT)/%/CMakeCache.txt
-
diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile
index 6e98aed..543b826 100644
--- a/build/amd64-ubuntu-builder.dockerfile
+++ b/build/amd64-ubuntu-builder.dockerfile
@@ -10,6 +10,7 @@ RUN set -x \
cmake \
ninja-build \
pkg-config \
+ rsync \
valgrind \
&& rm -rf /var/lib/apt/lists/*
@@ -70,12 +71,13 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
ARG USERID=1000
-ARG WORKSPACE=/workspace
+ARG PROJECT_ROOT=/workspace/src
+ARG OUT=/workspace/out
RUN set -x \
&& useradd -u "$USERID" -ms /bin/bash user \
- && mkdir -p "$WORKSPACE" \
- && chown user:user "$WORKSPACE"
+ && mkdir -p "$PROJECT_ROOT" "$OUT" \
+ && chown user:user "$PROJECT_ROOT" "$OUT"
-WORKDIR "$WORKSPACE"
+WORKDIR "$OUT"
diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile
index d706488..f605e0c 100644
--- a/build/arm32v7-ubuntu-builder.dockerfile
+++ b/build/arm32v7-ubuntu-builder.dockerfile
@@ -12,6 +12,7 @@ RUN set -x \
cmake \
ninja-build \
pkg-config \
+ rsync \
&& rm -rf /var/lib/apt/lists/*
COPY src /usr/local/src
@@ -71,12 +72,13 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
ARG USERID=1000
-ARG WORKSPACE=/workspace
+ARG PROJECT_ROOT=/workspace/src
+ARG OUT=/workspace/out
RUN set -x \
&& useradd -u "$USERID" -ms /bin/bash user \
- && mkdir -p "$WORKSPACE" \
- && chown user:user "$WORKSPACE"
+ && mkdir -p "$PROJECT_ROOT" "$OUT" \
+ && chown user:user "$PROJECT_ROOT" "$OUT"
-WORKDIR "$WORKSPACE"
+WORKDIR "$OUT"
diff --git a/build/discover_cc_settings.sh b/build/discover_cc_settings.sh
new file mode 100755
index 0000000..f6c8c74
--- /dev/null
+++ b/build/discover_cc_settings.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+set -e
+
+cleanup() {
+ rm -rf "$INCLUDE_DIRS_TMPFILE"
+}
+
+trap cleanup TERM INT EXIT
+
+DEST="${DEST:-$PWD}"
+INCLUDE_DIRS_TMPFILE="${2:-$(mktemp -p "$DEST" include_dirs_XXXXXXXXXX.txt)}"
+INCLUDE_DIRS_FILE="${INCLUDE_DIRS_FILE:-$DEST/include_dirs.txt}"
+
+CMAKE_CACHE_FILE="${1:-CMakeCache.txt}"
+CMAKE_CXX_COMPILER="$(sed -n -e 's/CMAKE_CXX_COMPILER:FILEPATH=\(.*\)$/\1/p' "$CMAKE_CACHE_FILE")"
+CMAKE_C_COMPILER="$(sed -n -e 's/CMAKE_C_COMPILER:FILEPATH=\(.*\)$/\1/p' "$CMAKE_CACHE_FILE")"
+
+C_BUILTIN_FILE="${C_BUILTIN_FILE:-$DEST/builtins.h}"
+CXX_BUILTIN_FILE="${CXX_BUILTIN_FILE:-$DEST/builtins.hpp}"
+
+if [ -z "${RSYNC+x}" ]; then
+ RSYNC=rsync
+fi
+
+{
+ {
+ echo | "$CMAKE_CXX_COMPILER" -xc++ -E -Wp,-v - 2>&1;
+ echo | "$CMAKE_C_COMPILER" -xc -E -Wp,-v - 2>&1;
+ } \
+ | sed -n -e 's/\s\+\(\/.*$\).*/\1/p';
+
+ sed -n -e 's/.*_INCLUDE_DIRS:INTERNAL=\(.*\)$/\1/p' "$CMAKE_CACHE_FILE";
+} \
+| sed 's/;/\n/g' | sed '/^$/d' | sort -u 2>/dev/null 1> "$INCLUDE_DIRS_TMPFILE"
+
+{
+ echo '#include <...> search starts here:'
+ cat "$INCLUDE_DIRS_TMPFILE" | sed -n -e "s@\(.*\)@$DEST\1@p"
+ echo 'End of search list.'
+} > "$INCLUDE_DIRS_FILE"
+
+if [ -n "$RSYNC" ]; then
+ "$RSYNC" -arR --files-from="$INCLUDE_DIRS_TMPFILE" / "$DEST"
+ echo "Include folders copied to $DEST" >&2
+fi
+
+"$CMAKE_C_COMPILER" -xc -dM -E - < /dev/null > "$C_BUILTIN_FILE"
+echo "C Compiler built-ins written to $C_BUILTIN_FILE" >&2
+"$CMAKE_CXX_COMPILER" -xc++ -dM -E - < /dev/null > "$CXX_BUILTIN_FILE"
+echo "C++ Compiler built-ins written to $CXX_BUILTIN_FILE" >&2
diff --git a/build/get_source_date_epoch.sh b/build/get_source_date_epoch.sh
index a8bb69a..1e3dada 100755
--- a/build/get_source_date_epoch.sh
+++ b/build/get_source_date_epoch.sh
@@ -1,25 +1,27 @@
#!/bin/sh
+set -e
+
export LANG=C
export LC_ALL=C
[ -n "$TOPDIR" ] && cd "$TOPDIR"
try_git() {
- [ -e .git ] || return 1
- SOURCE_DATE_EPOCH="$(git log -1 --format=format:%ct)"
- [ -n "$SOURCE_DATE_EPOCH" ]
+ [ -e .git ] || return 1
+ SOURCE_DATE_EPOCH="$(git log -1 --format=format:%ct)"
+ [ -n "$SOURCE_DATE_EPOCH" ]
}
try_hg() {
- [ -d .hg ] || return 1
- SOURCE_DATE_EPOCH="$(hg log --template '{date}' -l 1 | cut -d. -f1)"
- [ -n "$SOURCE_DATE_EPOCH" ]
+ [ -d .hg ] || return 1
+ SOURCE_DATE_EPOCH="$(hg log --template '{date}' -l 1 | cut -d. -f1)"
+ [ -n "$SOURCE_DATE_EPOCH" ]
}
try_mtime() {
- perl -e 'print((stat $ARGV[0])[9])' "$0"
- [ -n "$SOURCE_DATE_EPOCH" ]
+ perl -e 'print((stat $ARGV[0])[9])' "$0"
+ [ -n "$SOURCE_DATE_EPOCH" ]
}
try_git || try_hg || try_mtime || SOURCE_DATE_EPOCH=""