Merge branch 'feature/patrick/dune-mac-os' into 'feature/bobot/jbuilder'

For MAC-OS

See merge request frama-c/frama-c!3811

share/Makefile.common

@@ -147,13 +147,15 @@ eval last=\$${$$\#}; \
 mv $$new_temp $$last' sed_inplace
 SED	= LC_ALL=C sed
 RM	= rm -f
-ifeq ($(shell uname -s 2> /dev/null),Darwin)
+TOUCH   = touch
+GIT	= git
+
+ifeq ($(PLATFORM),MacOS)
 TAR     = gtar
 else
+# Unix, Cygwin
 TAR     = tar
 endif
-TOUCH   = touch
-GIT	= git
 
 ##################
 # Make commands #

share/Makefile.linting

@@ -52,18 +52,28 @@ TO_UTF8 ?= iconv -t UTF-8 -f
 
 OCP_INDENT   ?= ocp-indent
 CLANG_FORMAT ?= clang-format
+# wc, tail, head, cmp
 
 # Default values necessary for
 #   LINT_MAKEFILE=<this-makefile> make -f <this-makefile> <lint-target>`
 # Otherwise theses variables are defined into share/Makefile.common
 SED     ?= LC_ALL=C sed
 ISED    ?= sed -i
+FIND    ?= find
 GIT     ?= git
 MKDIR   ?= mkdir -p
 MV      ?= mv
 RM      ?= rm -f
+RMDIR   ?= rm -rf
 TOUCH   ?= touch
 
+ifeq ($(PLATFORM),MacOS)
+XARGS   ?= xargs
+else
+# Unix, Cygwin
+XARGS   ?= xargs --no-run-if-empty
+endif
+
 ############
 
 # Can be set to the path of that makefile
@@ -136,7 +146,7 @@ endif
 .PHONY: clean-lint
 clean-lint:
 	echo "Cleaning LINT targets..."
-	rm -rf .lint
+	$(RMDIR) .lint
 
 clean:: clean-lint
 
@@ -157,7 +167,7 @@ LINT.clean-targets+= \
 # Generic rule
 $(LINT.clean-targets):
 	echo "[LINT] Cleaning $(patsubst clean-%,%,$@) targets..."
-	find .lint -type f -name \*.$(patsubst clean-%,%,$@) | xargs -n 10 $(RM)
+	$(FIND) .lint -type f -name \*.$(patsubst clean-%,%,$@) | $(XARGS) -n 10 $(RM)
 
 ###############################
 
@@ -180,7 +190,7 @@ $(LINT.check-targets):
 	$(GIT) ls-files $(LINT.dir) -z \
         | $(GIT) check-attr --stdin -z $@ \
         | $(SED) -zne 'x;n;n;s/^set$$//;t print;b;:print;x;p' \
-        | xargs --null -IXX sh -c '$(LINT.make) LINT_FILE="XX" $@ || exit 255'
+        | $(XARGS) -0 -IXX sh -c '$(LINT.make) LINT_FILE="XX" $@ || exit 255'
 
 #### fix-XXX targets
 
@@ -195,7 +205,7 @@ $(LINT.fix-targets):
 	$(GIT) ls-files $(LINT.dir) -z \
         | $(GIT) check-attr --stdin -z $(patsubst fix-%,check-%,$@) \
         | $(SED) -zne 'x;n;n;s/^set$$//;t print;b;:print;x;p' \
-        | xargs --null -IXX sh -c '$(LINT.make) LINT_FILE="XX" $@ || exit 255'
+        | $(XARGS) -0 -IXX sh -c '$(LINT.make) LINT_FILE="XX" $@ || exit 255'
 
 
 else # LINT_FILE are given

share/Makefile.testing

@@ -24,11 +24,30 @@
 # TESTING #
 ###########
 
+################################
+## Default variables
+
 # Defines where to find the ptest_config files
 PURGED_PTEST_DIRS?=tests $(wildcard src/plugins/*/tests)
 PTEST_OPTS?=
 PTEST_DIRS?=$(PURGED_PTEST_DIRS)
 
+############
+# Default values necessary for make -f <this-makefile>
+
+GREP    ?= grep
+RM      ?= rm -f
+RMDIR   ?= rm -rf
+
+ifeq ($(PLATFORM),MacOS)
+XARGS   ?= xargs
+else
+# Unix, Cygwin
+XARGS   ?= xargs --no-run-if-empty
+endif
+
+##########################################################################
+
 # Defines the related dune targets
 PTEST_ALIASES=$(addsuffix /ptests,$(addprefix @, tests src/plugins))
 # TODO: uncomments when a dune file is at least generated for all PTEST_DIRS
@@ -58,7 +77,7 @@ else
 
 # PTESTS is internal
 PTESTS=dune exec $(DUNE_BUILD_OPTS) --root ptests -- frama-c-ptests
-#PTESTS=dune exec --root ptests -- frama-c-ptests -v
+#PTESTS=dune exec $(DUNE_BUILD_OPTS) --root ptests -- frama-c-ptests -v
 
 # Note: the public name of ptest.exe is frama-c-ptests
 $(FRAMAC_PTESTS): ptests/ptests.ml
@@ -96,18 +115,18 @@ wtests-help:
 	$(WTESTS) --help
 
 ##########################################################################
-## Removes all dune files generated for testing: xargs -n 10 avoids a too long line
+## Removes all dune files generated for testing
 
 .PHONY: purge-tests
 purge-tests:
 	find $(PURGED_PTEST_DIRS) -name dune \
-        | grep -e "/oracle.*/dune\|/result.*/dune" \
-        | xargs --no-run-if-empty -n 10 rm
+        | $(GREP) -e "/oracle.*/dune\|/result.*/dune" \
+        | $(XARGS) -n 10 $(RM)
 
 # Force the full cleaning of the testing environment
 .PHONY: clean-tests
 clean-tests: purge-tests
-	rm -rf $(addprefix _build/default/,$(PURGED_PTEST_DIRS))
+	$(RMDIR) $(addprefix _build/default/,$(PURGED_PTEST_DIRS))
 
 ##########################################################################
 ## Generates all dune files used for testing