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

Diff for /pegasus/mak/SDKMakefile between version 1.22 and 1.26

version 1.22, 2005/06/04 01:00:04 version 1.26, 2005/07/15 19:46:17
Line 50 
Line 50 
  
 HTML_SRCPATH = $(PEGASUS_HOME)/html HTML_SRCPATH = $(PEGASUS_HOME)/html
  
   DOC_SRCPATH1 = $(PEGASUS_ROOT)/doc
   
 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
 CLIENT_SRCPATH3 = $(PEGASUS_ROOT)/src/Clients CLIENT_SRCPATH3 = $(PEGASUS_ROOT)/src/Clients
   CLIENT_SRCPATH4 = $(PEGASUS_ROOT)/src/Providers/sample/AssociationProvider/testclient/
  
 PROVIDER_SRCPATH1 = $(PEGASUS_ROOT)/src/SDK/samples/Providers PROVIDER_SRCPATH1 = $(PEGASUS_ROOT)/src/SDK/samples/Providers
 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
 PROVIDER_SRCPATH4 = $(PEGASUS_ROOT)/src/Providers/IndicationConsumer PROVIDER_SRCPATH4 = $(PEGASUS_ROOT)/src/Providers/IndicationConsumer
   PROVIDER_SRCPATH5 = $(PEGASUS_ROOT)/src/Providers/sample
  
 INCLUDE_DIRS = \ INCLUDE_DIRS = \
   Pegasus \   Pegasus \
Line 139 
Line 143 
    Clients/DefaultC++/EnumInstances \    Clients/DefaultC++/EnumInstances \
    Clients/DefaultC++/InvokeMethod \    Clients/DefaultC++/InvokeMethod \
    Clients/DefaultC++/SendTestIndications \    Clients/DefaultC++/SendTestIndications \
      Clients/DefaultC++/Associations \
    Providers \    Providers \
    Providers/DefaultC++ \    Providers/DefaultC++ \
    Providers/DefaultC++/IndicationProvider \    Providers/DefaultC++/IndicationProvider \
    Providers/DefaultC++/InstanceProvider \    Providers/DefaultC++/InstanceProvider \
    Providers/DefaultC++/MethodProvider \    Providers/DefaultC++/MethodProvider \
    Providers/DefaultC++/SimpleDisplayConsumer \    Providers/DefaultC++/SimpleDisplayConsumer \
      Providers/DefaultC++/AssociationProvider \
      Providers/CMPI \
    Providers/CMPI/FilesAndDirectories \    Providers/CMPI/FilesAndDirectories \
    Providers/CMPI/FilesAndDirectories/tests \  
    Providers/Load \    Providers/Load \
    mak    mak
  
   DOCSRCPATH1FILES = \
      SecurityGuidelinesForDevelopers.html
  
 CLIENTSRCPATH1FILES = \ CLIENTSRCPATH1FILES = \
    Makefile \    Makefile \
Line 162 
Line 170 
    Clients/DefaultC++/Makefile \    Clients/DefaultC++/Makefile \
    Clients/DefaultC++/EnumInstances/Makefile \    Clients/DefaultC++/EnumInstances/Makefile \
    Clients/DefaultC++/InvokeMethod/Makefile \    Clients/DefaultC++/InvokeMethod/Makefile \
    Clients/DefaultC++/SendTestIndications/Makefile     Clients/DefaultC++/SendTestIndications/Makefile  \
      Clients/DefaultC++/Associations/Makefile
  
 CLIENTSRCPATH2FILES = \ CLIENTSRCPATH2FILES = \
    EnumInstances/EnumInstances.cpp \    EnumInstances/EnumInstances.cpp \
Line 171 
Line 180 
 CLIENTSRCPATH3FILES = \ CLIENTSRCPATH3FILES = \
    SendTestIndications/SendTestIndications.cpp    SendTestIndications/SendTestIndications.cpp
  
   CLIENTSRCPATH4FILES = \
      AssociationTestClient.cpp
   
 PROVIDERSRCPATH1FILES = \ PROVIDERSRCPATH1FILES = \
    Makefile \    Makefile \
    Load/Makefile \    Load/Makefile \
Line 186 
Line 198 
    DefaultC++/SimpleDisplayConsumer/Makefile \    DefaultC++/SimpleDisplayConsumer/Makefile \
    CMPI/Makefile \    CMPI/Makefile \
    CMPI/FilesAndDirectories/Makefile \    CMPI/FilesAndDirectories/Makefile \
    CMPI/FilesAndDirectories/tests/Makefile     DefaultC++/AssociationProvider/Makefile
   
  
 PROVIDERSRCPATH2FILES = \ PROVIDERSRCPATH2FILES = \
    Load/InstanceProviderR.mof \    Load/InstanceProviderR.mof \
    Load/MethodProviderR.mof \    Load/MethodProviderR.mof \
    Load/SimpleDisplayConsumerR.mof \    Load/SimpleDisplayConsumerR.mof \
    Load/CWS_FilesAndDir.mof \    Load/CWS_FilesAndDir.mof \
    Load/CWS_FilesAndDirR.mof     Load/CWS_FilesAndDirR.mof \
      Load/AssociationProvider.mof \
      Load/AssociationProviderR.mof
  
 #CMPI provider. #CMPI provider.
 PROVIDERSRCPATH2FILES += \ PROVIDERSRCPATH2FILES += \
      CMPI/FilesAndDirectories/tests/AssocDirNames12001rspgood.xml \  
      CMPI/FilesAndDirectories/tests/PlainFileMethodCall11001rspgood.xml \  
      CMPI/FilesAndDirectories/tests/AssocDirNames12001.xml \  
      CMPI/FilesAndDirectories/tests/EnumerateDir10001.xml \  
      CMPI/FilesAndDirectories/tests/DeleteDirInstance10003rspgood.xml \  
      CMPI/FilesAndDirectories/tests/DeleteDirInstance10003.xml \  
      CMPI/FilesAndDirectories/tests/ReferenceDirNames12002.xml \  
      CMPI/FilesAndDirectories/tests/ReferenceDirNames12002rspgood.xml \  
      CMPI/FilesAndDirectories/tests/GetDirInstance10002.xml \  
      CMPI/FilesAndDirectories/tests/EnumerateDirNames10000.xml \  
      CMPI/FilesAndDirectories/tests/PlainFileMethodCall11001.xml \  
      CMPI/FilesAndDirectories/tests/EnumerateDirNames10000rspgood.xml \  
      CMPI/FilesAndDirectories/tests/GetDirInstance10002rspgood.xml \  
      CMPI/FilesAndDirectories/tests/EnumerateDir10001rspgood.xml \  
      CMPI/FilesAndDirectories/cwssimdata.c \      CMPI/FilesAndDirectories/cwssimdata.c \
      CMPI/FilesAndDirectories/cwsutil.h \      CMPI/FilesAndDirectories/cwsutil.h \
      CMPI/FilesAndDirectories/CWS_Directory.c \      CMPI/FilesAndDirectories/CWS_Directory.c \
      CMPI/FilesAndDirectories/CWS_DirectoryContainsFile.c \      CMPI/FilesAndDirectories/CWS_DirectoryContainsFile.c \
      CMPI/FilesAndDirectories/cwsutil.c \      CMPI/FilesAndDirectories/cwsutil.c \
      CMPI/FilesAndDirectories/cwstest.c \  
      CMPI/FilesAndDirectories/CWS_FileUtils.c \      CMPI/FilesAndDirectories/CWS_FileUtils.c \
      CMPI/FilesAndDirectories/CWS_PlainFile.c \      CMPI/FilesAndDirectories/CWS_PlainFile.c \
      CMPI/FilesAndDirectories/CWS_FileUtils.h      CMPI/FilesAndDirectories/CWS_FileUtils.h
Line 239 
Line 237 
    SimpleDisplayConsumer/SimpleDisplayConsumer.cpp \    SimpleDisplayConsumer/SimpleDisplayConsumer.cpp \
    SimpleDisplayConsumer/SimpleDisplayConsumer.h    SimpleDisplayConsumer/SimpleDisplayConsumer.h
  
   PROVIDERSRCPATH5FILES = \
      AssociationProvider/AssociationProvider.cpp \
      AssociationProvider/AssociationProvider.h \
      AssociationProvider/AssociationProviderMain.cpp
   
   
 error: error:
         @echo "Please specify an action"         @echo "Please specify an action"
  
Line 246 
Line 250 
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageINCLUDE         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageINCLUDE
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageHTML         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageHTML
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageSAMPLES         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageSAMPLES
           @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile stageDOCS
  
 stageINCLUDE: stageINCLUDE:
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)
Line 290 
Line 295 
         @$(ECHO) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak         @$(ECHO) "" >> $(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         @$(CAT)  $(PEGASUS_ROOT)/src/SDK/samples/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
  
   stageDOCS:
           @$(foreach i, $(DOCSRCPATH1FILES), $(COPY) $(DOC_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)
   
 stageSAMPLES: stageSAMPLES:
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
Line 297 
Line 305 
         @$(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);)
           @$(foreach i, $(CLIENTSRCPATH4FILES), $(COPY) $(CLIENT_SRCPATH4)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/Associations/$(i);)
         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(i);)         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(i);)
         @$(foreach i, $(PROVIDERSRCPATH2FILES), $(COPY) $(PROVIDER_SRCPATH2)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(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);)         @$(foreach i, $(PROVIDERSRCPATH3FILES), $(COPY) $(PROVIDER_SRCPATH3)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i);)
         @$(foreach i, $(PROVIDERSRCPATH4FILES), $(COPY) $(PROVIDER_SRCPATH4)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i);)         @$(foreach i, $(PROVIDERSRCPATH4FILES), $(COPY) $(PROVIDER_SRCPATH4)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i);)
           @$(foreach i, $(PROVIDERSRCPATH5FILES), $(COPY) $(PROVIDER_SRCPATH5)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i);)
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createConfigFile         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createConfigFile
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createPlatformFile         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createPlatformFile
  
Line 340 
Line 350 
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(CLIENTSRCPATH3FILES), $(ECHO-E) \         @$(foreach i, $(CLIENTSRCPATH3FILES), $(ECHO-E) \
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(CLIENTSRCPATH4FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/Associations/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(ECHO-E) \         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(ECHO-E) \
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PROVIDERSRCPATH2FILES), $(ECHO-E) \         @$(foreach i, $(PROVIDERSRCPATH2FILES), $(ECHO-E) \
Line 348 
Line 360 
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PROVIDERSRCPATH4FILES), $(ECHO-E) \         @$(foreach i, $(PROVIDERSRCPATH4FILES), $(ECHO-E) \
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PROVIDERSRCPATH5FILES), $(ECHO-E) \
                 "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# SDK Documentation"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "# SDK Documentation"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(foreach i, $(DOCSRCPATH1FILES), \
                 $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_DOC_DIR)/$(i)" \
                            >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) "%attr(-,$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_HTML_DIR)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%attr(-,$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_HTML_DIR)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
Line 371 
Line 388 
              PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \              PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \
              PEGASUS_INDICATION_CONSUMER_LOG_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/SimpleDisplayConsumer              PEGASUS_INDICATION_CONSUMER_LOG_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/SimpleDisplayConsumer
         @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile createrepository \         @$(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               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         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i registerproviders PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
  
 deregisterproviders: deregisterproviders:

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