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

Diff for /pegasus/mak/SDKMakefile between version 1.7 and 1.13

version 1.7, 2004/09/09 05:41:52 version 1.13, 2005/03/25 09:29:03
Line 31 
Line 31 
 PROVIDER_SRCPATH3 = $(PEGASUS_ROOT)/InterfaceArchive/v002001/tests/Providers PROVIDER_SRCPATH3 = $(PEGASUS_ROOT)/InterfaceArchive/v002001/tests/Providers
 PROVIDER_SRCPATH4 = $(PEGASUS_ROOT)/src/Providers/IndicationConsumer PROVIDER_SRCPATH4 = $(PEGASUS_ROOT)/src/Providers/IndicationConsumer
  
 INCLUDEFILES = \  INCLUDE_DIRS = \
     Pegasus \
     Pegasus/Client \
     Pegasus/Common \
     Pegasus/Consumer \
     Pegasus/Provider
   
   INCLUDE_FILES = \
    Pegasus/Client/CIMClientException.h \    Pegasus/Client/CIMClientException.h \
    Pegasus/Client/CIMClient.h \    Pegasus/Client/CIMClient.h \
    Pegasus/Client/Linkage.h \    Pegasus/Client/Linkage.h \
Line 75 
Line 82 
    Pegasus/Provider/CIMOMHandle.h \    Pegasus/Provider/CIMOMHandle.h \
    Pegasus/Provider/CIMProvider.h \    Pegasus/Provider/CIMProvider.h \
    Pegasus/Provider/Linkage.h \    Pegasus/Provider/Linkage.h \
    Pegasus/Provider/ProviderException.h \     Pegasus/Provider/ProviderException.h
    Pegasus/Provider/CMPI/cmpidt.h \  
    Pegasus/Provider/CMPI/cmpift.h \  
    Pegasus/Provider/CMPI/cmpimacs.h \  
    Pegasus/Provider/CMPI/CmpiArgs.h \  
    Pegasus/Provider/CMPI/CmpiArray.h \  
    Pegasus/Provider/CMPI/CmpiAssociationMI.h \  
    Pegasus/Provider/CMPI/CmpiBaseMI.h \  
    Pegasus/Provider/CMPI/CmpiBooleanData.h \  
    Pegasus/Provider/CMPI/CmpiBroker.h \  
    Pegasus/Provider/CMPI/CmpiCharData.h \  
    Pegasus/Provider/CMPI/CmpiContext.h \  
    Pegasus/Provider/CMPI/CmpiData.h \  
    Pegasus/Provider/CMPI/CmpiDateTime.h \  
    Pegasus/Provider/CMPI/CmpiEnumeration.h \  
    Pegasus/Provider/CMPI/CmpiIndicationMI.h \  
    Pegasus/Provider/CMPI/CmpiInstance.h \  
    Pegasus/Provider/CMPI/CmpiInstanceMI.h \  
    Pegasus/Provider/CMPI/CmpiIndicationMI.h \  
    Pegasus/Provider/CMPI/CmpiMethodMI.h \  
    Pegasus/Provider/CMPI/CmpiObject.h \  
    Pegasus/Provider/CMPI/CmpiObjectPath.h \  
    Pegasus/Provider/CMPI/CmpiPropertyMI.h \  
    Pegasus/Provider/CMPI/CmpiProviderBase.h \  
    Pegasus/Provider/CMPI/CmpiResult.h \  
    Pegasus/Provider/CMPI/CmpiSelectExp.h \  
    Pegasus/Provider/CMPI/CmpiStatus.h \  
    Pegasus/Provider/CMPI/CmpiString.h  
  
 INCLUDEFILES += \  INCLUDE_FILES += \
    Pegasus/Common/AcceptLanguages.h \    Pegasus/Common/AcceptLanguages.h \
    Pegasus/Common/MessageLoader.h \    Pegasus/Common/MessageLoader.h \
    Pegasus/Common/ContentLanguages.h \    Pegasus/Common/ContentLanguages.h \
Line 114 
Line 94 
    Pegasus/Common/ContentLanguageElement.h \    Pegasus/Common/ContentLanguageElement.h \
    Pegasus/Common/LanguageElement.h    Pegasus/Common/LanguageElement.h
  
   SAMPLES_DIRS = \
      Clients \
      Clients/DefaultC++ \
      Clients/DefaultC++/EnumInstances \
      Clients/DefaultC++/InvokeMethod \
      Clients/DefaultC++/SendTestIndications \
      Providers \
      Providers/DefaultC++ \
      Providers/DefaultC++/IndicationProvider \
      Providers/DefaultC++/InstanceProvider \
      Providers/DefaultC++/MethodProvider \
      Providers/DefaultC++/SimpleDisplayConsumer \
      Providers/Load \
      mak
  
 CLIENTSRCPATH1FILES = \ CLIENTSRCPATH1FILES = \
    Makefile \    Makefile \
Line 144 
Line 138 
    DefaultC++/Makefile \    DefaultC++/Makefile \
    DefaultC++/InstanceProvider/Makefile \    DefaultC++/InstanceProvider/Makefile \
    DefaultC++/MethodProvider/Makefile \    DefaultC++/MethodProvider/Makefile \
    CMPI/Makefile \  
    CMPI/FilesAndDirectories/Makefile \  
    CMPI/FilesAndDirectories/tests/Makefile \  
    DefaultC++/IndicationProvider/Makefile \    DefaultC++/IndicationProvider/Makefile \
    DefaultC++/IndicationProvider/IndicationProvider.cpp \    DefaultC++/IndicationProvider/IndicationProvider.cpp \
    DefaultC++/IndicationProvider/IndicationProvider.h \    DefaultC++/IndicationProvider/IndicationProvider.h \
Line 154 
Line 145 
    DefaultC++/SimpleDisplayConsumer/Makefile    DefaultC++/SimpleDisplayConsumer/Makefile
  
 PROVIDERSRCPATH2FILES = \ PROVIDERSRCPATH2FILES = \
    Load/CWS_FilesAndDir.mof \  
    Load/CWS_FilesAndDirR.mof \  
    Load/InstanceProviderR.mof \    Load/InstanceProviderR.mof \
    Load/MethodProviderR.mof \    Load/MethodProviderR.mof \
    Load/SimpleDisplayConsumerR.mof \     Load/SimpleDisplayConsumerR.mof
    CMPI/FilesAndDirectories/tests/AssocDirNames12001.xml \  
    CMPI/FilesAndDirectories/tests/AssocDirNames12001rspgood.xml \  
    CMPI/FilesAndDirectories/tests/DeleteDirInstance10003.xml \  
    CMPI/FilesAndDirectories/tests/DeleteDirInstance10003rspgood.xml \  
    CMPI/FilesAndDirectories/tests/EnumerateDir10001.xml \  
    CMPI/FilesAndDirectories/tests/EnumerateDir10001rspgood.xml \  
    CMPI/FilesAndDirectories/tests/EnumerateDirNames10000.xml \  
    CMPI/FilesAndDirectories/tests/EnumerateDirNames10000rspgood.xml \  
    CMPI/FilesAndDirectories/tests/GetDirInstance10002.xml \  
    CMPI/FilesAndDirectories/tests/GetDirInstance10002rspgood.xml \  
    CMPI/FilesAndDirectories/tests/PlainFileMethodCall11001.xml \  
    CMPI/FilesAndDirectories/tests/PlainFileMethodCall11001rspgood.xml \  
    CMPI/FilesAndDirectories/tests/ReferenceDirNames12002.xml \  
    CMPI/FilesAndDirectories/tests/ReferenceDirNames12002rspgood.xml \  
    CMPI/FilesAndDirectories/CWS_Directory.c \  
    CMPI/FilesAndDirectories/CWS_DirectoryContainsFile.c \  
    CMPI/FilesAndDirectories/CWS_FileUtils.c \  
    CMPI/FilesAndDirectories/CWS_FileUtils.h \  
    CMPI/FilesAndDirectories/CWS_PlainFile.c \  
    CMPI/FilesAndDirectories/cwssimdata.c \  
    CMPI/FilesAndDirectories/cwstest.c \  
    CMPI/FilesAndDirectories/cwsutil.c \  
    CMPI/FilesAndDirectories/cwsutil.h  
  
 PROVIDERSRCPATH3FILES = \ PROVIDERSRCPATH3FILES = \
    InstanceProvider/InstanceProvider.cpp \    InstanceProvider/InstanceProvider.cpp \
Line 210 
Line 176 
  
 stageINCLUDE: stageINCLUDE:
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Common          @$(foreach i, $(INCLUDE_DIRS), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i);)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Client          @$(foreach i, $(INCLUDE_FILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i);)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Provider  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Provider/CMPI  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Handler  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Consumer  
         @$(foreach i, $(INCLUDEFILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i);)  
  
 createPlatformFile: createPlatformFile:
         @$(ECHO) "ifndef PEGASUS_PROVIDER_LIB_DIR" >> $(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
Line 251 
Line 212 
         @$(CAT)  $(PEGASUS_ROOT)/src/SDK/samples/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak         @$(CAT)  $(PEGASUS_ROOT)/src/SDK/samples/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
  
 stageSAMPLES: stageSAMPLES:
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstop_IgnoreError  
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/EnumInstances          @$(foreach i, $(SAMPLES_DIRS), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i);)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/InvokeMethod  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/SendTestIndications  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/InstanceProvider  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/MethodProvider  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/IndicationProvider  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/SimpleDisplayConsumer  
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/CMPI/FilesAndDirectories/tests  
         @$(foreach i, $(CLIENTSRCPATH1FILES), $(COPY) $(CLIENT_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i);)         @$(foreach i, $(CLIENTSRCPATH1FILES), $(COPY) $(CLIENT_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i);)
         @$(foreach i, $(CLIENTSRCPATH2FILES), $(COPY) $(CLIENT_SRCPATH2)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i);)         @$(foreach i, $(CLIENTSRCPATH2FILES), $(COPY) $(CLIENT_SRCPATH2)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i);)
         @$(foreach i, $(CLIENTSRCPATH3FILES), $(COPY) $(CLIENT_SRCPATH3)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i);)         @$(foreach i, $(CLIENTSRCPATH3FILES), $(COPY) $(CLIENT_SRCPATH3)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i);)
Line 278 
Line 230 
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR)         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR)
         @$(MAKE) --directory=$(PEGASUS_ROOT)/doc/SDK -f Makefile PEGASUS_HTML_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR) buildDoc_ContinueOnError         @$(MAKE) --directory=$(PEGASUS_ROOT)/doc/SDK -f Makefile PEGASUS_HTML_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_HTML_DIR) buildDoc_ContinueOnError
  
   _append_filesSectionToSpecFile:
           @$(ECHO-E) "%files sdk"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%defattr($(Pr__r__r__),root,root)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# SDK Include Files"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),root,root) $(PEGASUS_INCLUDE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(foreach i, $(INCLUDE_DIRS), $(ECHO-E) \
                 "%dir %attr($(Prwxr_xr_x),root,root) $(PEGASUS_INCLUDE_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(INCLUDE_FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_INCLUDE_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# SDK Sample Files"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),root,root) $(PEGASUS_SAMPLES_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(foreach i, $(SAMPLES_DIRS), $(ECHO-E) \
                 "%dir %attr($(Prwxr_xr_x),root,root) $(PEGASUS_SAMPLES_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(CLIENTSRCPATH1FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(CLIENTSRCPATH2FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(CLIENTSRCPATH3FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PROVIDERSRCPATH1FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/Providers/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PROVIDERSRCPATH2FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/Providers/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PROVIDERSRCPATH3FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PROVIDERSRCPATH4FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),root,root) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# SDK Documentation"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "$(PEGASUS_HTML_DIR)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   
 removeSampleProviderNamespace: removeSampleProviderNamespace:
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstop_IgnoreError          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i cimstop
         @$(ECHO) +++++ Removing existing repository named root#SampleProvider         @$(ECHO) +++++ Removing existing repository named root#SampleProvider
         @$(RMREPOSITORY) $(REPOSITORY_ROOT)/root\#SampleProvider         @$(RMREPOSITORY) $(REPOSITORY_ROOT)/root\#SampleProvider
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f commands.mak cimstart          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile cimstart
  
 buildSDK: buildSDK:
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i removeSampleProviderNamespace         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i removeSampleProviderNamespace

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