pegasus/Makefile.Release - diff

Return to Makefile.Release CVS log

Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.Release between version 1.36 and 1.46

version 1.36, 2005/05/27 17:29:01

version 1.46, 2005/11/08 21:55:30

Line 103

libDefaultProviderManager \

libCertificateProvider \

libpegqueryexpression \

libpegcql \

libpegquerycommon \

libCIMQueryCapabilitiesProvider \

libInteropProvider \

libCIMOMStatDataProvider \

libpegservice

ifndef PEGASUS_DISABLE_CQL

PEGASUS_LIBRARIES += \

libpegcql \

libCIMQueryCapabilitiesProvider

endif

ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER

PEGASUS_LIBRARIES += \

libCMPIProviderManager \

Line 179

Line 183

cimconfig.8 \

cimserver.8

PEGASUS_DOC_FILES = \

Admin_Guide_Release.pdf \

PegasusSSLGuidelines.htm

CIM29_MOF_FILES = \

Application_AppRuntime.mof \

Application_BIOS.mof \

Line 490

Line 498

$(foreach i, $(INSTALL_SCRIPT_FILES), $(COPY) $(PEGASUS_ROOT)/installs/scripts/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/$(i);)

@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository

@$(ECHO-E) "PEGASUS_MOF_DIR=$(PEGASUS_MOF_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository

@$(ECHO-E) "PEGASUS_CIMXX_MOF_DIR=$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository

@$(ECHO-E) "PEGASUS_REPOSITORY_DIR=$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository

@$(ECHO-E) "PEGASUS_BIN_DIR=$(PEGASUS_BIN_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository

@$(ECHO-E) "PEGASUS_CIM_SCHEMA=$(PEGASUS_CIM_SCHEMA_VERSION)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository

Line 535

Line 544

$(foreach i, $(PEGASUS_UNIX_MAN_USER_PAGES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MANUSER_DIR)/$(i);)

$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MANADMIN_DIR)/$(i);)

stage_PegasusDocFiles: FORCE

$(foreach i, $(PEGASUS_DOC_FILES), $(COPY) $(ROOT)/doc/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)

setpermissions_PegasusDocFiles: FORCE

$(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)

copyCIMSchemaFiles: FORCE

$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)

$(foreach i, $($(PEGASUS_CIM_SCHEMA)_MOF_FILES), $(COPY) $(ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i);)

Line 624

Line 639

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusVarDataDirectoryFiles

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusRepositoryDirectories

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusUnixManPageDirectoryFiles

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusDocFiles

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusMOFDirectoryFiles

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusSSLFiles

$(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusSystemFiles

Line 637

Line 653

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusVarDataDirectoryFiles

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusRepositoryDirectories

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusUnixManPageDirectoryFiles

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusDocFiles

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusMOFDirectoryFiles

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusSSLFiles

$(MAKE) -f $(ROOT)/Makefile.Release setpermissions_PegasusSystemFiles

Line 692

Line 709

@$(ECHO-E) "#define PEGASUS_PRODUCT_VERSION "\""$(PEGASUS_PRODUCT_VERSION)"\""" >> $(ROOT)/src/Pegasus/Common/ProductVersion.h

@$(ECHO-E) "#define PEGASUS_PRODUCT_STATUS "\""$(PEGASUS_PRODUCT_STATUS)"\""" >> $(ROOT)/src/Pegasus/Common/ProductVersion.h

@$(ECHO-E) " " >> $(ROOT)/src/Pegasus/Common/ProductVersion.h

@$(ECHO-E) "#define PEGASUS_CIMOM_GENERIC_NAME \"Pegasus\"" >> $(ROOT)/src/Pegasus/Common/ProductVersion.h

@$(ECHO-E) "#define PEGASUS_CIMOM_DESCRIPTION \"\"" >> $(ROOT)/src/Pegasus/Common/ProductVersion.h

@$(ECHO-E) "#endif /* Product_Version_h */" >> $(ROOT)/src/Pegasus/Common/ProductVersion.h

endif

Line 732

Line 751

_append_PreambleToSpecFile: FORCE

@$(ECHO-E) "%define srcRelease 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "Release: 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "Epoch: 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

Line 761

Line 780

$(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%global PEGASUS_SBIN_DIR $(PEGASUS_SBIN_DIR)" >> \

$(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%global PEGASUS_DOC_DIR $(PEGASUS_DOC_DIR)" >> \

$(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%global PEGASUS_RPM_ROOT \044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION" >> \

$(PEGASUS_RPM_SPEC_FILE_PATH)

Line 898

Line 919

@$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-post.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "# End of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "elif [ \044\061 -gt 1 ]; then" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) " if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) " then" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) " # Running Repository Upgrade utility" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) " %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "/sbin/service tog-pegasus condrestart" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) ":;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

_append_postSectionToSpecFile_createSymbolicLinks: FORCE

Line 965

Line 994

@$(ECHO-E) "%files" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(foreach i, $(PRODUCT_DIRECTORY_STRUCTURE), if [ $(i) != $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR) ]; then \

if [ $(i) != $(PEGASUS_REPOSITORY_DIR) ]; then \

$(ECHO-E) "%dir %attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi;)

if [ $(i) != $(PEGASUS_TRACE_DIR) ]; then \

$(ECHO-E) "%dir %attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi;)

@$(ECHO-E) "%dir %attr(1555,$(CIMSERVER_USR),$(CIMSERVER_GRP)) $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%dir %attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%dir %attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MOF_DIR)/Pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%attr(-,$(CIMSERVER_USR),$(CIMSERVER_GRP)) $(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(foreach i, $(PEGASUS_LICENSE), \

Line 979

Line 1011

$(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MANUSER_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

@$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), \

$(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MANADMIN_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

@$(foreach i, $(PEGASUS_DOC_FILES), \

$(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(foreach i, $($(PEGASUS_CIM_SCHEMA)_MOF_FILES), \

$(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

Line 992

Line 1026

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__),$(CIMSERVER_USR),$(CIMSERVER_GRP)) \

$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%config %attr($(Pr_x______),$(INSTALL_USR),$(INSTALL_GRP)) /etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%config(noreplace) %attr($(Pr_x______),$(INSTALL_USR),$(INSTALL_GRP)) /etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%config %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) %PAM_CONFIG_DIR/wbem" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "%config(noreplace) %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) %PAM_CONFIG_DIR/wbem" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)

@$(foreach i, $(PEGASUS_ADMIN_CMDS), \

$(ECHO-E) "%attr($(Pr_x______),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SBIN_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

Legend:

Removed from v.1.36
changed lines
	Added in v.1.46

No CVS admin address has been configured