(file) Return to Makefile.Release CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.Release between version 1.48.2.1 and 1.49

version 1.48.2.1, 2006/02/10 16:08:59 version 1.49, 2006/01/06 23:01:44
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%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 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; Symantec Corporation; The Open Group.  
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 440 
Line 438 
    PG_Authorization20.mof \    PG_Authorization20.mof \
    PG_ConfigSetting20.mof \    PG_ConfigSetting20.mof \
    PG_InternalSchema20.mof \    PG_InternalSchema20.mof \
    PG_SSLCertificate20.mof \  
    PG_SSLCertificateRevocationList20.mof \  
    PG_ShutdownService20.mof \    PG_ShutdownService20.mof \
    PG_User20.mof    PG_User20.mof
  
Line 474 
Line 470 
 stage_PegasusProductDirectories: FORCE stage_PegasusProductDirectories: FORCE
         $(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)         $(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)
         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)  
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)  
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)  
  
 setpermissions_PegasusProductDirectories: FORCE setpermissions_PegasusProductDirectories: FORCE
         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(i);)         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(i);)
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)  
  
 stage_PegasusSocketDirectory: FORCE stage_PegasusSocketDirectory: FORCE
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
Line 767 
Line 758 
         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \
              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef CIMSERVER_LOCK_FILE" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define CIMSERVER_LOCK_FILE"  \  
              "\""$(CIMSERVER_LOCK_FILE)"\"" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "#endif /* Common_Product_Directory_Structure_h */ " \         @$(ECHO-E) "#endif /* Common_Product_Directory_Structure_h */ " \
Line 869 
Line 855 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), \         @$(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), \
              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(ECHO-E) "ls -ld $(PEGASUS_DEST_LIB_DIR)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS-SPECIFIC DIRECTORIES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS-SPECIFIC DIRECTORIES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \         @$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \
              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_DIR)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_LIB_DIR)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
Line 1015 
Line 995 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%global PEGASUS_ARCH_LIB %{_lib}" >> \  
             $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \         @$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \
             $(PEGASUS_RPM_SPEC_FILE_PATH)             $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global OPENSSL_BIN $(OPENSSL_BIN)" >> \         @$(ECHO-E) "%global OPENSSL_BIN $(OPENSSL_BIN)" >> \
Line 1047 
Line 1022 
         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \
              "$(PEGASUS_CIMSERVER_START_FILE)"  \              "$(PEGASUS_CIMSERVER_START_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global CIMSERVER_LOCK_FILE" \  
              "$(CIMSERVER_LOCK_FILE)"  \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_PREV_REPOSITORY_DIR_NAME" \         @$(ECHO-E) "%global PEGASUS_PREV_REPOSITORY_DIR_NAME" \
Line 1075 
Line 1047 
         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_PackagesToSpecFile: FORCE _append_PackagesToSpecFile: FORCE
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-packages.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-packages.spec \
Line 1132 
Line 1107 
         @$(ECHO-E) "     %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \         @$(ECHO-E) "     %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   /etc/init.d/tog-pegasus condrestart" \          @$(ECHO-E) "   /sbin/service tog-pegasus condrestart" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1144 
Line 1119 
         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
             $(ECHO-E) "   ln -sf $(i)$(LIB_SUFFIX)\             $(ECHO-E) "   ln -sf $(i)$(LIB_SUFFIX)\
             $(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \              $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   # Create Symbolic Links for Packaged Provider Libraries"\         @$(ECHO-E) "   # Create Symbolic Links for Packaged Provider Libraries"\
Line 1152 
Line 1127 
         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \
             "   ln -sf $(i)$(LIB_SUFFIX)\             "   ln -sf $(i)$(LIB_SUFFIX)\
             $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \              $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(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 1206 
Line 1181 
              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \
                    $(ECHO-E) "%dir $(i)" >> \                    $(ECHO-E) "%dir $(i)" >> \
              $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi;)              $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi;)
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \  
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \  
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \         @$(ECHO-E) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \
              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
Line 1260 
Line 1231 
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \             "$(PEGASUS_DEST_LIB_DIR)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \             "$(PEGASUS_PROVIDER_LIB_DIR)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1276 
Line 1247 
             $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\             $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\
             "$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             "$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
             $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \              $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PEGASUS_PROVIDERS), \         @$(foreach i, $(PEGASUS_PROVIDERS), \
             $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \              $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  

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