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

Diff for /pegasus/mak/SDKMakefile between version 1.39 and 1.44.2.1

version 1.39, 2006/09/28 00:18:17 version 1.44.2.1, 2008/11/17 18:37:11
Line 122 
Line 122 
    Pegasus/Provider/CMPI/cmpidt.h \    Pegasus/Provider/CMPI/cmpidt.h \
    Pegasus/Provider/CMPI/cmpimacs.h \    Pegasus/Provider/CMPI/cmpimacs.h \
    Pegasus/Provider/CMPI/cmpios.h \    Pegasus/Provider/CMPI/cmpios.h \
    Pegasus/Provider/CMPI/cmpipl.h \     Pegasus/Provider/CMPI/cmpipl.h
    Pegasus/Provider/CMPI/cmpi_cql.h  
  
 SAMPLES_DIRS = \ SAMPLES_DIRS = \
    Clients \    Clients \
Line 143 
Line 142 
    Providers/CMPI/FilesAndDirectories \    Providers/CMPI/FilesAndDirectories \
    Providers/CMPI/CWS_Util \    Providers/CMPI/CWS_Util \
    Providers/Load \    Providers/Load \
      Providers/Load/$(PEGASUS_CIM_SCHEMA) \
      Providers/Load/$(PEGASUS_CIM_SCHEMA)/DMTF \
      Providers/Load/$(PEGASUS_CIM_SCHEMA)/DMTF/Core \
      Providers/Load/$(PEGASUS_CIM_SCHEMA)/DMTF/Event \
      Providers/Load/$(PEGASUS_CIM_SCHEMA)/DMTF/System \
    mak    mak
  
 DOCSRCPATH1FILES = \ DOCSRCPATH1FILES = \
Line 166 
Line 170 
    Clients/DefaultC++/SendTestIndications/SendTestIndications.cpp \    Clients/DefaultC++/SendTestIndications/SendTestIndications.cpp \
    Clients/DefaultC++/Associations/AssociationTestClient.cpp    Clients/DefaultC++/Associations/AssociationTestClient.cpp
  
   CIMMOFFILES = \
      DMTF/qualifiers.mof \
      DMTF/qualifiers_optional.mof \
      DMTF/Core/CIM_ManagedElement.mof \
      DMTF/Core/CIM_ManagedSystemElement.mof \
      DMTF/Core/CIM_LogicalElement.mof \
      DMTF/Core/CIM_Component.mof \
      DMTF/Event/CIM_Indication.mof \
      DMTF/System/CIM_LogicalFile.mof \
      DMTF/System/CIM_DataFile.mof \
      DMTF/System/CIM_DirectoryContainsFile.mof \
      DMTF/System/CIM_Directory.mof
   
 PROVIDERSRCPATH1FILES = \ PROVIDERSRCPATH1FILES = \
    Makefile \    Makefile \
    Load/Makefile \    Load/Makefile \
      Load/SDK_CIM_Schema.mof \
    Load/SampleProviderSchema.mof \    Load/SampleProviderSchema.mof \
    Load/IndicationProviderR.mof \    Load/IndicationProviderR.mof \
    Load/InstanceProviderR.mof \    Load/InstanceProviderR.mof \
Line 218 
Line 236 
    CMPI/CWS_Util/cwsutil.h \    CMPI/CWS_Util/cwsutil.h \
    CMPI/CWS_Util/cwsutil.c    CMPI/CWS_Util/cwsutil.c
  
   define NL
   
   
   endef
  
 error: error:
         @echo "Please specify an action"         @echo "Please specify an action"
Line 231 
Line 253 
 stageINCLUDE: stageINCLUDE:
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)
         @$(foreach i, $(INCLUDE_DIRS), $(MKDIRHIER) \         @$(foreach i, $(INCLUDE_DIRS), $(MKDIRHIER) \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i);)              $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i)$(NL))
         @$(foreach i, $(INCLUDE_FILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) \         @$(foreach i, $(INCLUDE_FILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i);)              $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/$(i)$(NL))
         @$(COPY) $(INCLUDE_SRCPATH)/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h \         @$(COPY) $(INCLUDE_SRCPATH)/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h             $(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR)/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h
  
Line 249 
Line 271 
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(foreach i, $(SAMPLE_DIRS), $(ECHO-E) "ls -ld" \         @$(foreach i, $(SAMPLE_DIRS), $(ECHO-E) "ls -ld" \
              "$(PEGASUS_SAMLES_DIR)/$(i)" \              "$(PEGASUS_SAMLES_DIR)/$(i)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)               >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
         @$(ECHO-E) "ls -ld $(PEGASUS_INCLUDE_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_INCLUDE_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(foreach i, $(INCLUDE_DIRS), $(ECHO-E) "ls -ld" \         @$(foreach i, $(INCLUDE_DIRS), $(ECHO-E) "ls -ld" \
              "$(PEGASUS_INCLUDE_DIR)/$(i)" \              "$(PEGASUS_INCLUDE_DIR)/$(i)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)               >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
         @$(ECHO-E) "ls -ld $(PEGASUS_HTML_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_HTML_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS INCLUDE FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS INCLUDE FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(foreach i, $(INCLUDE_FILES), $(ECHO-E) "ls -ld" \         @$(foreach i, $(INCLUDE_FILES), $(ECHO-E) "ls -ld" \
              "$(PEGASUS_INCLUDE_DIR)/$(i)" \              "$(PEGASUS_INCLUDE_DIR)/$(i)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)               >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS SAMPLE FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS SAMPLE FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(foreach i, $(CLIENTSRCPATH1FILES), $(ECHO-E) "ls -ld" \         @$(foreach i, $(CLIENTSRCPATH1FILES), $(ECHO-E) "ls -ld" \
              "$(PEGASUS_SAMPLES_DIR)/$(i)" \              "$(PEGASUS_SAMPLES_DIR)/$(i)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)               >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
         @$(foreach i, $(PROVIDERSCPATH1FILES), $(ECHO-E) "ls -ld" \         @$(foreach i, $(PROVIDERSCPATH1FILES), $(ECHO-E) "ls -ld" \
              "$(PEGASUS_SAMPLES_DIR)/Providers/$(i)" \              "$(PEGASUS_SAMPLES_DIR)/Providers/$(i)" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)               >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
         @$(ECHO-E) "ls -l $(PEGASUS_SAMPLES_DIR)/mak/config.mak" \         @$(ECHO-E) "ls -l $(PEGASUS_SAMPLES_DIR)/mak/config.mak" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(ECHO-E) "ls -l" \         @$(ECHO-E) "ls -l" \
Line 335 
Line 357 
         @$(ECHO) "ifndef PEGASUS_CIM_SCHEMA_DIR" \         @$(ECHO) "ifndef PEGASUS_CIM_SCHEMA_DIR" \
             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "   PEGASUS_CIM_SCHEMA_DIR =" \         @$(ECHO) "   PEGASUS_CIM_SCHEMA_DIR =" \
             "$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)" \              "$(PEGASUS_CIM_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)" \
             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "   CIM_SCHEMA_VER = " \         @$(ECHO) "   CIM_SCHEMA_VER = " \
             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
Line 357 
Line 379 
             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak             >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
  
 stageDOCS: stageDOCS:
         @$(foreach i, $(DOCSRCPATH1FILES), $(COPY) $(DOC_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)          @$(foreach i, $(DOCSRCPATH1FILES), $(COPY) $(DOC_SRCPATH1)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i)$(NL))
  
 stageSAMPLES: stageSAMPLES:
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
Line 369 
Line 391 
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_BIN_DIR)         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_BIN_DIR)
         @$(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_BIN_DIR)/target         @$(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_BIN_DIR)/target
         @$(foreach i, $(SAMPLES_DIRS), $(MKDIRHIER) \         @$(foreach i, $(SAMPLES_DIRS), $(MKDIRHIER) \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i);)              $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i)$(NL))
         @$(foreach i, $(CLIENTSRCPATH1FILES), $(COPY) $(CLIENT_SRCPATH1)/$(i) \         @$(foreach i, $(CLIENTSRCPATH1FILES), $(COPY) $(CLIENT_SRCPATH1)/$(i) \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i);)              $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/$(i)$(NL))
           @$(foreach i, $(CIMMOFFILES), $(COPY) $(CIM_SCHEMA_DIR)/$(i) \
               $(PEGASUS_STAGING_DIR)$(PEGASUS_CIM_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i)$(NL))
         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) \         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(i);)              $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/$(i)$(NL))
         @$(COPY) $(CLIENT_SRCPATH1)/mak/$(PEGASUS_PLATFORM).mak \         @$(COPY) $(CLIENT_SRCPATH1)/mak/$(PEGASUS_PLATFORM).mak \
             $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak             $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createConfigFile         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createConfigFile
Line 388 
Line 412 
  
 _append_preunSectionToSpecFile: _append_preunSectionToSpecFile:
         @$(ECHO-E) "%preun devel" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%preun devel" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# Check if the SDK has been setup" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "if [ -f $(PEGASUS_SAMPLES_DIR)/SDKIsSetup ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   make --directory $(PEGASUS_SAMPLES_DIR) -s unsetupSDK" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   if [ \044? != 0 ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"++++++++++++++++++++++++++++++++++++++++++++++\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"ERROR: Failed to deregister sample providers.\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"To remove the SDK rpm without deregistering\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"the sample providers, first remove file\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"$(PEGASUS_SAMPLES_DIR)/SDKIsSetup,\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"then remove SDK rpm.\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      echo \"++++++++++++++++++++++++++++++++++++++++++++++\" >&2" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "      exit 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "make --directory $(PEGASUS_SAMPLES_DIR) -s clean" \         @$(ECHO-E) "make --directory $(PEGASUS_SAMPLES_DIR) -s clean" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 397 
Line 446 
         @$(ECHO-E) "%defattr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP),$(Prwxr_xr_x))" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%defattr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP),$(Prwxr_xr_x))" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_SAMPLES_DIR)" \         @$(ECHO-E) "$(PEGASUS_SAMPLES_DIR)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_SAMPLES_OBJ_DIR)" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_SAMPLES_LIB_DIR)" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_SAMPLES_BIN_DIR)" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_INCLUDE_DIR)/Pegasus" \         @$(ECHO-E) "$(PEGASUS_INCLUDE_DIR)/Pegasus" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_DOC_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "$(PEGASUS_DOC_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_HTML_DIR)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "$(PEGASUS_HTML_DIR)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_LINK_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 removeSampleProviderNamespace: removeSampleProviderNamespace:
Line 434 
Line 476 
             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 \         @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load \
             -f Makefile createrepository \             -f Makefile createrepository \
             PEGASUS_MOF_DIR=$(PEGASUS_ROOT)/Schemas \              PEGASUS_CIM_MOF_DIR=$(PEGASUS_ROOT)/Schemas \
             PEGASUS_BIN_DIR=$(PEGASUS_HOME)bin              PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile  -i \         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile  -i \
             registerproviders PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin             registerproviders PEGASUS_BIN_DIR=$(PEGASUS_HOME)/bin
  

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