BUG#: 1959

TITLE: tog-pegasus.spec, Makefile.Release Fixes for 2.4 Release

DESCRIPTION: Modified pegasus/doc/SDK/Makefile and pegasus/mak/SDKMakefile to allow staging of SDK to proceed if DOCXX is not available.

diff --git a/doc/SDK/Makefile b/doc/SDK/Makefile
index 6cc1540df1a8839c20eca14c5f4204ff8458080f..11b97462d27f9b6c1b75ad4e0bc27db562b96cac 100644 (file)
--- a/doc/SDK/Makefile
+++ b/doc/SDK/Makefile
@@ -18,6 +18,7 @@ endif
 
 DIR = DevManual
 include $(ROOT)/mak/config.mak
+include $(ROOT)/mak/commands.mak
 
 
 ifdef HTML_DESTPATH
@@ -33,6 +34,13 @@ COMMON_INTERFACE_HEAD = CommonInterface.dxx
 CMPI_INTERFACE_HEAD = CMPIInterface.dxx
 CMPI_C_INTERFACE_HEAD = CMPI_C_Interface.dxx
 
+FORCE:
+
+buildDoc_ContinueOnError:
+       @if $(DOCXX) --version > /dev/null 2>&1; \
+then $(MAKE) --directory=$(ROOT)/doc/SDK -f Makefile HTML_DESTPATH=$(HTML_DESTPATH) buildDoc;\
+else $(ECHO) "Warning: API documentation not generated.  $(DOCXX) command not found."; fi
+
 buildDoc:
        @$(RMDIRHIER) $(INTERFACE_OUTPUT)
        @$(MKDIRHIER) $(INTERFACE_OUTPUT)

diff --git a/mak/SDKMakefile b/mak/SDKMakefile
index 60b0d560fca66b30a3134b2b46636bc5ff2dbac5..bc9cf66883a5393363c89131b7c30f844fc6ad8a 100644 (file)
--- a/mak/SDKMakefile
+++ b/mak/SDKMakefile
@@ -210,7 +210,7 @@ stageSAMPLES:
 stageHTML:
        @$(RMDIRHIER) $(HTML_DESTPATH)
        @$(MKDIRHIER) $(HTML_DESTPATH)
-       $(MAKE) --directory=$(PEGASUS_ROOT)/doc/SDK -f Makefile HTML_DESTPATH=$(HTML_DESTPATH) buildDoc
+       @$(MAKE) --directory=$(PEGASUS_ROOT)/doc/SDK -f Makefile HTML_DESTPATH=$(HTML_DESTPATH) buildDoc_ContinueOnError
 
 removeSampleProviderNamespace:
        @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstop_IgnoreError