Merge branch 'bmk/diameter/20241107/nowarn_missing_spec_documented' i…

…nto maint

lib/diameter/Makefile

@@ -27,7 +27,7 @@ SPECIAL_TARGETS =
 
 include $(ERL_TOP)/make/otp_subdir.mk
 
-DIA_PLT_APPS=ssl runtime_tools syntax_tools
+DIA_PLT_APPS=public_key ssl runtime_tools syntax_tools
 TEST_NEEDS_RELEASE=true
 
 include $(ERL_TOP)/make/app_targets.mk

lib/diameter/src/Makefile

@@ -110,12 +110,20 @@ ifeq ($(TYPE),debug)
 ERL_COMPILE_FLAGS += -Ddebug
 endif
 
+# The "warn" flag is on by default, so unless we add the
+# the "nowarn" flag, that ("warn") is what we get.
+# The "nowarn" flag overrides the "warn" flag if both
+# are present!
+ifeq ($(NOWARN_MISSING_SPEC_DOCUMENTED),true)
+MISSING_SPEC_DOCUMENTED = +nowarn_missing_spec_documented
+endif
+
 ERL_COMPILE_FLAGS += \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"$(APP_VSN)"}' \
 	+warn_export_vars \
 	+warn_unused_vars \
-	+nowarn_missing_spec_documented \
+	$(MISSING_SPEC_DOCUMENTED) \
+	+'{parse_transform,sys_pre_attributes}' \
+	+'{attribute,insert,app_vsn,"$(APP_VSN)"}' \
 	-pa $(ABS_EBIN) \
 	-I $(INCDIR) \
 	-I gen \
@@ -212,9 +220,17 @@ info:
 	@echo
 	@$(call list,BINS)
 	@echo ========================================
+	@echo "APP_FILE:          $(APP_FILE)"
+	@echo "APPUP_FILE:        $(APPUP_FILE)"
+	@echo "EXAMPLE_DIRS:      $(EXAMPLE_DIRS)"
+	@echo "NOWARN_MISSING_SPEC_DOCUMENTED: $(NOWARN_MISSING_SPEC_DOCUMENTED)"
+	@echo "MISSING_SPEC_DOCUMENTED: $(MISSING_SPEC_DOCUMENTED)"
+	@echo "ERL_COMPILE_FLAGS: $(ERL_COMPILE_FLAGS)"
+	@echo ========================================
 
 clean:
 	rm -f $(TARGET_FILES) gen/*
+	rm -f $(PLT)
 	rm -f depend.mk
 
 realclean: clean
@@ -246,6 +262,7 @@ dialyze: opt $(PLT)
 	                         $(DICT_MODULES) \
 	                         $(INFO_MODULES)))
 
+
 # ----------------------------------------------------
 # Release targets
 # ----------------------------------------------------

lib/diameter/src/base/diameter_service.erl

@@ -213,6 +213,9 @@ stop(No, _) ->
 %% So, technically, the service is already stopped,
 %% but the cleanup may not have completed...
 %% This is a simple race, so we should not have to wait long...
+
+-doc false.
+
 await_service_cleanup(SvcName) ->
     do_await_service_cleanup(SvcName, 10).
 

make/otp_subdir.mk

@@ -53,6 +53,10 @@ $(TYPES) release docs release_docs tests release_tests clean depend static_lib:
 			APP_PWD="$$app_pwd" APP_VSN=$$app_vsn APP=$$app	\
 			TESTROOT="$(TESTROOT)" update)			\
 		|| exit $$?  ;						\
+	    else							\
+		if test clean = $@ && test ! -f SKIP; then		\
+			$(MAKE) dclean;					\
+		fi ;							\
 	    fi	;							\
 	    echo "=== Leaving application" `basename $$app_pwd` ;	\
 	fi