(file) Return to SDKMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/SDKMakefile between version 1.1.2.3 and 1.5

version 1.1.2.3, 2004/04/23 03:36:20 version 1.5, 2004/09/02 04:25:49
Line 1 
Line 1 
 include $(PEGASUS_ROOT)/mak/config.mak include $(PEGASUS_ROOT)/mak/config.mak
   include $(PEGASUS_ROOT)/mak/commands.mak
  
 CP = cp  ifndef PEGASUS_STAGING_DIR
      PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stageSDK/
   endif
   
   ifndef PEGASUS_SAMPLES_DIR
      PEGASUS_SAMPLES_DIR = samples
   endif
   
   ifndef PEGASUS_INCLUDE_DIR
      PEGASUS_INCLUDE_DIR = include
   endif
   
   ifndef PEGASUS_HTML_DIR
      PEGASUS_HTML_DIR = html
   endif
  
 SDK_STAGINGDIR = $(PEGASUS_HOME)/stageSDK  
  
 INCLUDE_SRCPATH = $(PEGASUS_ROOT)/src INCLUDE_SRCPATH = $(PEGASUS_ROOT)/src
 INCLUDE_DESTPATH = $(SDK_STAGINGDIR)/include  
  
 HTML_SRCPATH = $(PEGASUS_HOME)/html HTML_SRCPATH = $(PEGASUS_HOME)/html
 HTML_DESTPATH = $(SDK_STAGINGDIR)/html  
  
 CLIENT_SRCPATH1 = $(PEGASUS_ROOT)/src/SDK/samples CLIENT_SRCPATH1 = $(PEGASUS_ROOT)/src/SDK/samples
 CLIENT_SRCPATH2 = $(PEGASUS_ROOT)/InterfaceArchive/v002001/tests/Clients CLIENT_SRCPATH2 = $(PEGASUS_ROOT)/InterfaceArchive/v002001/tests/Clients
Line 17 
Line 29 
 PROVIDER_SRCPATH2 = $(PEGASUS_ROOT)/src/Providers/sample PROVIDER_SRCPATH2 = $(PEGASUS_ROOT)/src/Providers/sample
 PROVIDER_SRCPATH3 = $(PEGASUS_ROOT)/InterfaceArchive/v002001/tests/Providers PROVIDER_SRCPATH3 = $(PEGASUS_ROOT)/InterfaceArchive/v002001/tests/Providers
  
 SAMPLE_DESTPATH = $(SDK_STAGINGDIR)  
   
 INCLUDEFILES = \ INCLUDEFILES = \
    Pegasus/Client/CIMClientException.h \    Pegasus/Client/CIMClientException.h \
    Pegasus/Client/CIMClient.h \    Pegasus/Client/CIMClient.h \
Line 100 
Line 110 
    Pegasus/Common/AcceptLanguageElement.h \    Pegasus/Common/AcceptLanguageElement.h \
    Pegasus/Common/Formatter.h \    Pegasus/Common/Formatter.h \
    Pegasus/Common/ContentLanguageElement.h \    Pegasus/Common/ContentLanguageElement.h \
    Pegasus/Common/LanguageParser.h \  
    Pegasus/Common/LanguageElement.h    Pegasus/Common/LanguageElement.h
  
  
Line 128 
Line 137 
    DefaultC++/InstanceProvider/Makefile \    DefaultC++/InstanceProvider/Makefile \
    DefaultC++/MethodProvider/Makefile \    DefaultC++/MethodProvider/Makefile \
    CMPI/Makefile \    CMPI/Makefile \
    CMPI/FilesAndDirectories/Makefile     CMPI/FilesAndDirectories/Makefile \
      CMPI/FilesAndDirectories/tests/Makefile
  
 PROVIDERSRCPATH2FILES = \ PROVIDERSRCPATH2FILES = \
    Load/CWS_FilesAndDir.mof \    Load/CWS_FilesAndDir.mof \
    Load/CWS_FilesAndDirR.mof \    Load/CWS_FilesAndDirR.mof \
    Load/RT_Indication.mof \  
    Load/IndicationProviderR.mof \  
    Load/InstanceProviderR.mof \    Load/InstanceProviderR.mof \
    Load/MethodProviderR.mof \    Load/MethodProviderR.mof \
    Load/SimpleDisplayConsumerR.mof \  
    Load/SampleProviderSchema.mof \    Load/SampleProviderSchema.mof \
    CMPI/FilesAndDirectories/tests/AssocDirNames12001.xml \    CMPI/FilesAndDirectories/tests/AssocDirNames12001.xml \
    CMPI/FilesAndDirectories/tests/AssocDirNames12001rspgood.xml \    CMPI/FilesAndDirectories/tests/AssocDirNames12001rspgood.xml \
Line 179 
Line 186 
         @echo "Please specify an action"         @echo "Please specify an action"
  
 stageSDK: stageSDK:
         @$(RMDIRHIER) $(SDK_STAGINGDIR)          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageINCLUDE
         $(MAKE) -f SDKMakefile stageINCLUDE          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageHTML
         $(MAKE) -f SDKMakefile stageHTML          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageSAMPLES
         $(MAKE) -f SDKMakefile stageSAMPLES  
  
 stageINCLUDE: stageINCLUDE:
         @$(RMDIRHIER) $(INCLUDE_DESTPATH)          @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)
         @$(MKDIRHIER) $(INCLUDE_DESTPATH)/Pegasus/Common          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Common
         @$(MKDIRHIER) $(INCLUDE_DESTPATH)/Pegasus/Client          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Client
         @$(MKDIRHIER) $(INCLUDE_DESTPATH)/Pegasus/Provider          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Provider
         @$(MKDIRHIER) $(INCLUDE_DESTPATH)/Pegasus/Provider/CMPI          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Provider/CMPI
         @$(MKDIRHIER) $(INCLUDE_DESTPATH)/Pegasus/Handler          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Handler
         @$(MKDIRHIER) $(INCLUDE_DESTPATH)/Pegasus/Consumer          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Consumer
         @$(foreach i, $(INCLUDEFILES), $(CP) $(INCLUDE_SRCPATH)/$(i) $(INCLUDE_DESTPATH)/$(i);)          @$(foreach i, $(INCLUDEFILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i);)
   
   createPlatformFile:
           @$(ECHO) "ifndef PEGASUS_PLATFORM" > $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_PLATFORM = $(PEGASUS_PLATFORM)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "ifndef PEGASUS_PROVIDER_LIB_DIR" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_LIB_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "ifndef PEGASUS_DEST_LIB_DIR" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_DEST_LIB_DIR = $(PEGASUS_DEST_LIB_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "ifndef PEGASUS_INCLUDE_DIR" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_INCLUDE_DIR = $(PEGASUS_INCLUDE_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "ifndef PEGASUS_MOF_DIR" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_MOF_DIR = $(PEGASUS_MOF_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "ifndef PEGASUS_SAMPLES_DIR" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_SAMPLES_DIR = $(PEGASUS_SAMPLES_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "ifndef PEGASUS_BIN_DIR" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "   PEGASUS_BIN_DIR = $(PEGASUS_BIN_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "endif" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(ECHO) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
           @$(CAT) $(CLIENT_SRCPATH1)/mak/$(PEGASUS_PLATFORM).mak  >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
  
 stageSAMPLES: stageSAMPLES:
         @$(RMDIRHIER) $(SAMPLE_DESTPATH)/samples          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstop_IgnoreError
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/mak          @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/Clients/DefaultC++/EnumInstances          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/Clients/DefaultC++/InvokeMethod          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/EnumInstances
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/Providers/Load          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/InvokeMethod
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/Providers/DefaultC++/InstanceProvider          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/Providers/DefaultC++/MethodProvider          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/InstanceProvider
         @$(MKDIRHIER) $(SAMPLE_DESTPATH)/samples/Providers/CMPI/FilesAndDirectories/tests          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/MethodProvider
         @$(foreach i, $(CLIENTSRCPATH1FILES), $(CP) $(CLIENT_SRCPATH1)/$(i) $(SAMPLE_DESTPATH)/samples/$(i);)          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/CMPI/FilesAndDirectories/tests
         @$(foreach i, $(CLIENTSRCPATH2FILES), $(CP) $(CLIENT_SRCPATH2)/$(i) $(SAMPLE_DESTPATH)/samples/Clients/DefaultC++/$(i);)          @$(foreach i, $(CLIENTSRCPATH1FILES), $(COPY) $(CLIENT_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i);)
         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(CP) $(PROVIDER_SRCPATH1)/$(i) $(SAMPLE_DESTPATH)/samples/Providers/$(i);)          @$(foreach i, $(CLIENTSRCPATH2FILES), $(COPY) $(CLIENT_SRCPATH2)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i);)
         @$(foreach i, $(PROVIDERSRCPATH2FILES), $(CP) $(PROVIDER_SRCPATH2)/$(i) $(SAMPLE_DESTPATH)/samples/Providers/$(i);)          @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(i);)
         @$(foreach i, $(PROVIDERSRCPATH3FILES), $(CP) $(PROVIDER_SRCPATH3)/$(i) $(SAMPLE_DESTPATH)/samples/Providers/DefaultC++/$(i);)          @$(foreach i, $(PROVIDERSRCPATH2FILES), $(COPY) $(PROVIDER_SRCPATH2)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(i);)
           @$(foreach i, $(PROVIDERSRCPATH3FILES), $(COPY) $(PROVIDER_SRCPATH3)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i);)
           @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createPlatformFile
  
 stageHTML: stageHTML:
         @$(RMDIRHIER) $(HTML_DESTPATH)          @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR)
         @$(MKDIRHIER) $(HTML_DESTPATH)          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR)
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/SDK -f Makefile HTML_DESTPATH=$(HTML_DESTPATH) buildDoc          @$(MAKE) --directory=$(PEGASUS_ROOT)/doc/SDK -f Makefile PEGASUS_HTML_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR) buildDoc_ContinueOnError
   
   removeSampleProviderNamespace:
           @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstop_IgnoreError
           @$(ECHO) +++++ Removing existing repository named root#SampleProvider
           @$(RMREPOSITORY) $(REPOSITORY_ROOT)/root\#SampleProvider
           @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstart
  
 buildSDK: buildSDK:
         @$(MAKE) --directory=$(SAMPLE_DESTPATH)/samples -f Makefile PEGASUS_LIB_DIR=$(PEGASUS_HOME)/lib \          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i deregisterproviders
              PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDES="-I $(INCLUDE_DESTPATH)" \          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i removeSampleProviderNamespace
              CIM_MOF_PATH=$(PEGASUS_ROOT)/Schemas/CIM27 clean          @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile clean \
         @$(MAKE) --directory=$(SAMPLE_DESTPATH)/samples -f Makefile PEGASUS_LIB_DIR=$(PEGASUS_HOME)/lib \               PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \
              PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDES="-I $(INCLUDE_DESTPATH)" \               PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib
              CIM_MOF_PATH=$(PEGASUS_ROOT)/Schemas/CIM27 SAMPLES_DIR=$(SAMPLE_DESTPATH)/samples          @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile all \
                PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \
                PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
           @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile createrepository \
                PEGASUS_MOF_DIR=$(PEGASUS_ROOT)/Schemas PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
           @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i registerproviders PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
  
 deregisterproviders: deregisterproviders:
         @$(MAKE) --directory=$(SAMPLE_DESTPATH)/samples/Providers/Load -f Makefile deregisterproviders          @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile deregisterproviders \
                PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
  
 registerproviders: registerproviders:
         @$(MAKE) --directory=$(SAMPLE_DESTPATH)/samples/Providers/Load -f Makefile registerproviders          @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile registerproviders \
                PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
  
 testSDK: testSDK:
         @$(MAKE) --directory=$(SAMPLE_DESTPATH)/samples -f Makefile PEGASUS_LIB_DIR=$(PEGASUS_HOME)/lib \          @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile  tests \
              PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDES="-I $(INCLUDE_DESTPATH)" \               PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
              CIM_MOF_PATH=$(PEGASUS_ROOT)/Schemas/CIM27 SAMPLES_DIR=$(SAMPLE_DESTPATH)/samples tests  
   

Legend:
Removed from v.1.1.2.3  
changed lines
  Added in v.1.5
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2