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

Diff for /pegasus/mak/SDKMakefile between version 1.25 and 1.32.2.1

version 1.25, 2005/07/14 00:36:11 version 1.32.2.1, 2006/01/18 17:37:54
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 115 
Line 114 
    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/Common/AcceptLanguages.h \     Pegasus/Common/AcceptLanguageList.h \
    Pegasus/Common/MessageLoader.h \    Pegasus/Common/MessageLoader.h \
    Pegasus/Common/ContentLanguages.h \     Pegasus/Common/ContentLanguageList.h \
    Pegasus/Common/LanguageElementContainer.h \     Pegasus/Common/LanguageTag.h \
    Pegasus/Common/AcceptLanguageElement.h \     Pegasus/Common/Formatter.h
    Pegasus/Common/Formatter.h \  
    Pegasus/Common/ContentLanguageElement.h \  
    Pegasus/Common/LanguageElement.h  
  
 INCLUDE_FILES += \ INCLUDE_FILES += \
    Pegasus/Client/ClientOpPerformanceDataHandler.h \    Pegasus/Client/ClientOpPerformanceDataHandler.h \
Line 150 
Line 146 
    Providers/DefaultC++/InstanceProvider \    Providers/DefaultC++/InstanceProvider \
    Providers/DefaultC++/MethodProvider \    Providers/DefaultC++/MethodProvider \
    Providers/DefaultC++/SimpleDisplayConsumer \    Providers/DefaultC++/SimpleDisplayConsumer \
    Providers/CMPI/FilesAndDirectories \  
    Providers/DefaultC++/AssociationProvider \    Providers/DefaultC++/AssociationProvider \
      Providers/CMPI \
      Providers/CMPI/FilesAndDirectories \
      Providers/CMPI/CWS_Util \
    Providers/Load \    Providers/Load \
    mak    mak
  
Line 160 
Line 158 
  
 CLIENTSRCPATH1FILES = \ CLIENTSRCPATH1FILES = \
    Makefile \    Makefile \
    mak/config.mak \  
    mak/program.mak \    mak/program.mak \
    mak/recurse.mak \    mak/recurse.mak \
    mak/library.mak \    mak/library.mak \
Line 197 
Line 194 
    DefaultC++/SimpleDisplayConsumer/Makefile \    DefaultC++/SimpleDisplayConsumer/Makefile \
    CMPI/Makefile \    CMPI/Makefile \
    CMPI/FilesAndDirectories/Makefile \    CMPI/FilesAndDirectories/Makefile \
      CMPI/CWS_Util/Makefile \
    DefaultC++/AssociationProvider/Makefile    DefaultC++/AssociationProvider/Makefile
  
 PROVIDERSRCPATH2FILES = \ PROVIDERSRCPATH2FILES = \
Line 210 
Line 208 
  
 #CMPI provider. #CMPI provider.
 PROVIDERSRCPATH2FILES += \ PROVIDERSRCPATH2FILES += \
      CMPI/FilesAndDirectories/cwssimdata.c \       CMPI/CWS_Util/cwssimdata.c \
      CMPI/FilesAndDirectories/cwsutil.h \       CMPI/CWS_Util/cwsutil.h \
        CMPI/CWS_Util/cwsutil.c \
      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/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 258 
Line 256 
         @$(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
  
   create_ProductInstallationVerificationScript:
           @$(RM) $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS SYSETM DIRECTORIES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_INCLUDE_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS DEVEL DIRECTORIES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_SAMPLES_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(foreach i, $(SAMPLE_DIRS), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMLES_DIR)/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(ECHO-E) "ls -ld $(PEGASUS_INCLUDE_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(foreach i, $(INCLUDE_DIRS), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_INCLUDE_DIR)/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(ECHO-E) "ls -ld $(PEGASUS_HTML_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS INCLUDE FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(foreach i, $(INCLUDE_FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_INCLUDE_DIR)/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS SAMPLE FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(foreach i, $(CLIENTSRCPATH1FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(CLIENTSRCPATH2FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(CLIENTSRCPATH3FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(CLIENTSRCPATH4FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/Associations/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(PROVIDERSCPATH1FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Providers/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(PROVIDERSRCPATH2FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Providers/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(PROVIDERSRCPATH3FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(PROVIDERSRCPATH4FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(foreach i, $(PROVIDERSRCPATH5FILES), $(ECHO-E) "ls -ld" \
                "$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall;)
           @$(ECHO-E) "ls -l $(PEGASUS_SAMPLES_DIR)/mak/config.mak" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
           @$(ECHO-E) "ls -l" \
                "$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak" \
                >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
   
 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
         @$(ECHO) "   PEGASUS_PROVIDER_LIB_DIR = $(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
Line 319 
Line 377 
         @$(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_preunSectionToSpecFile: _append_preunSectionToSpecFile:
         @$(ECHO-E) "%preun sdk" >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "%preun devel" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "make --directory $(PEGASUS_SAMPLES_DIR) -s clean"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "make --directory $(PEGASUS_SAMPLES_DIR) -s clean"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_filesSectionToSpecFile: _append_filesSectionToSpecFile:
         @$(ECHO-E) "%files sdk"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "%files devel"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(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) "# SDK Include Files"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "$(PEGASUS_INCLUDE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "$(PEGASUS_SAMPLES_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_INCLUDE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "$(PEGASUS_DOC_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(INCLUDE_DIRS), $(ECHO-E) \          @$(ECHO-E) "$(PEGASUS_HTML_DIR)"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
               "%dir %attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_INCLUDE_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)          @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_PROVIDER_LIB_DIR)/*$(LIB_LINK_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(INCLUDE_FILES), $(ECHO-E) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_INCLUDE_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_INCLUDE_DIR)/Pegasus/Common/Platform_%PEGASUS_HARDWARE_PLATFORM.h"  \  
                        >> $(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($(Prwxrwxrwx),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(foreach i, $(SAMPLES_DIRS), $(ECHO-E) \  
               "%dir %attr($(Prwxrwxrwx),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(CLIENTSRCPATH1FILES), $(ECHO-E) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/mak/%PEGASUS_HARDWARE_PLATFORM.mak"  \  
                         >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(foreach i, $(CLIENTSRCPATH2FILES), $(ECHO-E) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Clients/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(CLIENTSRCPATH3FILES), $(ECHO-E) \  
               "%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) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(PROVIDERSRCPATH2FILES), $(ECHO-E) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(PROVIDERSRCPATH3FILES), $(ECHO-E) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(PROVIDERSRCPATH4FILES), $(ECHO-E) \  
               "%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) "# SDK Documentation"  >> $(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) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 removeSampleProviderNamespace: removeSampleProviderNamespace:

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