(file) Return to RPMMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/RPMMakefile between version 1.1.2.6 and 1.6.2.1

version 1.1.2.6, 2008/02/20 02:35:54 version 1.6.2.1, 2008/11/20 01:00:30
Line 38 
Line 38 
 ############################################################################### ###############################################################################
  
  
 HOME_DIR=$(shell pwd)  include pegasus/env_var_Linux.status
   
 RELEASE:=$(shell lsb_release -r -s) RELEASE:=$(shell lsb_release -r -s)
 IDISTRO:=$(shell lsb_release -i -s) IDISTRO:=$(shell lsb_release -i -s)
 PLATFORM:=$(shell /bin/rpm --eval %_target_cpu) PLATFORM:=$(shell /bin/rpm --eval %_target_cpu)
Line 49 
Line 50 
 else else
     RPMBUILD:=rpmbuild -vv     RPMBUILD:=rpmbuild -vv
 endif endif
 RPMBUILD:=rpmbuild  
 RM:=rm RM:=rm
 MV:=mv MV:=mv
 CP:=cp CP:=cp
 GREP:=grep GREP:=grep
 ECHO:=echo ECHO:=echo
 TOG_INSTALLED_RPMS:=$(shell $(RPM) -qa|grep tog-pegasus) TOG_INSTALLED_RPMS:=$(shell $(RPM) -qa|grep tog-pegasus)
 PEGASUS_BIN_DIR:=/usr/bin  
 PEGASUS_SBIN_DIR:=/usr/sbin  
 PEGASUS_SAMPLES_DIR:=/usr/share/Pegasus/samples  
 PEGASUS_RPM_TEST_DIR:=/usr/share/Pegasus/test  
 PEGASUS_TEST_BIN_DIR:=/usr/share/Pegasus/test/bin  
 PEGASUS_SCRIPT_DIR:=/usr/share/Pegasus/scripts  
 CIMSERVER_START_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver CIMSERVER_START_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver
 CIMSERVER_STOP_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver -s CIMSERVER_STOP_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver -s
  
 ifndef PEGASUS_SRC_RELEASE  
     PEGASUS_SRC_RELEASE:=1  
 endif  
   
 ifdef PEGASUS_BUILD_BRANCH ifdef PEGASUS_BUILD_BRANCH
     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)
         PEGASUS_RPM_CVS_TAG:=HEAD         PEGASUS_RPM_CVS_TAG:=HEAD
Line 81 
Line 71 
  
 ifeq ($(IDISTRO),RedHatEnterpriseServer) ifeq ($(IDISTRO),RedHatEnterpriseServer)
     DISTRO:=REDHAT     DISTRO:=REDHAT
     export PEGASUS_DISTRO_SUFFIX:=$(if $(filter $(RELEASE),4.92 4.93 5),el5,\      export PEGASUS_DISTRO_SUFFIX:= \
         xxx)          $(if $(filter $(RELEASE),4.92 4.93 5),el5,xxx)
 else else
     ifeq ($(findstring RedHat,$(IDISTRO)),RedHat)     ifeq ($(findstring RedHat,$(IDISTRO)),RedHat)
         DISTRO:=REDHAT         DISTRO:=REDHAT
Line 133 
Line 123 
   TOG_PEGASUS_DIR:=tog-pegasus   TOG_PEGASUS_DIR:=tog-pegasus
 endif endif
  
 VERSION:=$(PEGASUS_RPM_VERSION)-$(PEGASUS_SRC_RELEASE)  VERSION:=$(PEGASUS_PRODUCT_VERSION)-$(PEGASUS_PACKAGE_VERSION)
 CORE_RPM:=tog-pegasus-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm CORE_RPM:=tog-pegasus-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
 SDK_RPM:=tog-pegasus-devel-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm SDK_RPM:=tog-pegasus-devel-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
 TEST_RPM:=tog-pegasus-test-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm TEST_RPM:=tog-pegasus-test-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
Line 160 
Line 150 
         $(USAGE)"Input variables:"         $(USAGE)"Input variables:"
         $(USAGE)"PEGASUS_BUILD_BRANCH - pegasus branch to build"         $(USAGE)"PEGASUS_BUILD_BRANCH - pegasus branch to build"
         $(USAGE)"                       HEAD is used if MAIN is specified"         $(USAGE)"                       HEAD is used if MAIN is specified"
         $(USAGE)"PEGASUS_RPM_VERSION  - pegasus release version (Required)"  
         $(USAGE)"PEGASUS_SRC_RELEASE  - pegasus source release number"  CORE_PATTERN = \"core*\"
         $(USAGE)"                       defaults to 1 if not specified"  define checkForCores
         $(USAGE)"PEGASUS_RPM_DIRECTORY- path to target binary rpm directory"          @if [ "`find $1 $2  -name $(CORE_PATTERN)`" != "" ]; \
         $(USAGE)"                       if it is not defined"               then echo "*** One or more core files found:" \
         $(USAGE)"                       defaults to /usr/src/redhat"                  "`find $1 $2 -name $(CORE_PATTERN)`"; \
         $(USAGE)"                       for Red Hat distributions"                  exit 1; fi;
         $(USAGE)"                       defaults to /usr/src/packages"          @if [ "$(PEGASUS_CORE_DIR)" != "" ] && \
         $(USAGE)"                       for SUSE distributions"               [ "`find $(PEGASUS_CORE_DIR) -maxdepth 1 -name $(CORE_PATTERN)`" \
         $(USAGE)""                  != "" ]; then echo "*** One or more core files found:" \
                   "`find $(PEGASUS_CORE_DIR) -maxdepth 1 -name $(CORE_PATTERN)`";\
                   exit 1; fi
   endef
  
 exportSRC: exportSRC:
         @cvs -d:pserver:anon@cvs.opengroup.org:/cvs/MSB export -r $(PEGASUS_RPM_CVS_TAG) pegasus         @cvs -d:pserver:anon@cvs.opengroup.org:/cvs/MSB export -r $(PEGASUS_RPM_CVS_TAG) pegasus
  
 createSRCRPM: createSRCRPM:
  
 ifndef PEGASUS_RPM_VERSION  ifndef PEGASUS_PRODUCT_VERSION
         @$(ECHO) "PEGASUS_RPM_VERSION is not defined"          @$(ECHO) "PEGASUS_PRODUCT_VERSION is not defined"
         @exit 2         @exit 2
 endif endif
         @$(MV) pegasus tog-pegasus-$(PEGASUS_RPM_VERSION)          @$(MV) pegasus tog-pegasus-$(PEGASUS_PRODUCT_VERSION)
         @$(CP) tog-pegasus-$(PEGASUS_RPM_VERSION)/rpm/tog-pegasus.spec $(PEGASUS_RPM_DIRECTORY)/SPECS          @$(CP) tog-pegasus-$(PEGASUS_PRODUCT_VERSION)/rpm/tog-pegasus.spec $(PEGASUS_RPM_DIRECTORY)/SPECS
         @tar czf tog-pegasus-$(VERSION).tar.gz tog-pegasus-$(PEGASUS_RPM_VERSION)          @tar czf tog-pegasus-$(VERSION).tar.gz tog-pegasus-$(PEGASUS_PRODUCT_VERSION)
         @$(CP) tog-pegasus-$(VERSION).tar.gz $(PEGASUS_RPM_DIRECTORY)/SOURCES/$(TOG_PEGASUS_DIR)         @$(CP) tog-pegasus-$(VERSION).tar.gz $(PEGASUS_RPM_DIRECTORY)/SOURCES/$(TOG_PEGASUS_DIR)
         @$(RPMBUILD) -bs $(PEGASUS_RPM_DIRECTORY)/SPECS/tog-pegasus.spec         @$(RPMBUILD) -bs $(PEGASUS_RPM_DIRECTORY)/SPECS/tog-pegasus.spec
  
Line 197 
Line 190 
         # Start cimserver         # Start cimserver
         -$(CIMSERVER_STOP_SERVICE)         -$(CIMSERVER_STOP_SERVICE)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         @$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         # Run some sanity tests         # Run some sanity tests
         # osinfo, cimserver -v, cimprovider -l -s, cimconfig -l -c etc         # osinfo, cimserver -v, cimprovider -l -s, cimconfig -l -c etc
         @$(ECHO) "+++++ Running sanity checks +++++"         @$(ECHO) "+++++ Running sanity checks +++++"
         @$(ECHO) "+++++ Running osinfo +++++"         @$(ECHO) "+++++ Running osinfo +++++"
         $(PEGASUS_BIN_DIR)/osinfo         $(PEGASUS_BIN_DIR)/osinfo
         -@$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Running cimserver -v +++++"         @$(ECHO) "+++++ Running cimserver -v +++++"
         $(PEGASUS_SBIN_DIR)/cimserver -v         $(PEGASUS_SBIN_DIR)/cimserver -v
         @$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Running cimconfig +++++"         @$(ECHO) "+++++ Running cimconfig +++++"
         $(PEGASUS_SBIN_DIR)/cimconfig -l -c         $(PEGASUS_SBIN_DIR)/cimconfig -l -c
         @$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Running cimprovider +++++"         @$(ECHO) "+++++ Running cimprovider +++++"
         $(PEGASUS_BIN_DIR)/cimprovider -l -s         $(PEGASUS_BIN_DIR)/cimprovider -l -s
         @$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Stopping cimserver +++++"         @$(ECHO) "+++++ Stopping cimserver +++++"
         @$(CIMSERVER_STOP_SERVICE)         @$(CIMSERVER_STOP_SERVICE)
         @$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Starting cimserver +++++"         @$(ECHO) "+++++ Starting cimserver +++++"
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         @$(HOME_DIR)/check_for_core          $(call checkForCores,./,-maxdepth 1)
  
         # Run samples         # Run samples
         @$(ECHO) "+++++ Running samples +++++"         @$(ECHO) "+++++ Running samples +++++"
Line 232 
Line 225 
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile setupSDK         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile setupSDK
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile testSDK         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile testSDK
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile unsetupSDK         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile unsetupSDK
         @$(HOME_DIR)/check_for_core          $(call checkForCores,$(PEGASUS_SAMPLES_DIR),)
  
         # Install the test RPM after running SDK tests. This is because         # Install the test RPM after running SDK tests. This is because
         # the test RPM over-writes the repository.         # the test RPM over-writes the repository.
         @$(ECHO) "+++++ Installing Test RPM +++++"         @$(ECHO) "+++++ Installing Test RPM +++++"
         $(RPM) -ih $(PEGASUS_RPM_DIRECTORY)/RPMS/$(PLATFORM)/$(TEST_RPM)         $(RPM) -ih $(PEGASUS_RPM_DIRECTORY)/RPMS/$(PLATFORM)/$(TEST_RPM)
         $(MAKE) --directory=$(PEGASUS_RPM_TEST_DIR) -f Makefile setupTEST          $(MAKE) --directory=$(PEGASUS_TEST_DIR) -f Makefile setupTEST
         $(MAKE) --directory=$(PEGASUS_RPM_TEST_DIR) -f Makefile tests          $(MAKE) --directory=$(PEGASUS_TEST_DIR) -f Makefile tests
         @$(HOME_DIR)/check_for_core          $(call checkForCores,$(PEGASUS_TEST_DIR),)
  
 # Install rpms # Install rpms
 install: install:
Line 253 
Line 246 
         -$(RPM) -e $(filter tog-pegasus-test%,$(TOG_INSTALLED_RPMS))         -$(RPM) -e $(filter tog-pegasus-test%,$(TOG_INSTALLED_RPMS))
         -$(RPM) -e $(filter tog-pegasus-devel%,$(TOG_INSTALLED_RPMS))         -$(RPM) -e $(filter tog-pegasus-devel%,$(TOG_INSTALLED_RPMS))
         -$(RPM) -e $(filter tog-pegasus-2%,$(TOG_INSTALLED_RPMS))         -$(RPM) -e $(filter tog-pegasus-2%,$(TOG_INSTALLED_RPMS))
         -$(RM) -rf  tog-pegasus-$(PEGASUS_RPM_VERSION)          -$(RM) -Rf tog-pegasus-$(PEGASUS_PRODUCT_VERSION).old
           -$(MV) tog-pegasus-$(PEGASUS_PRODUCT_VERSION) tog-pegasus-$(PEGASUS_PRODUCT_VERSION).old
  
 buildRPM: cleanRPM createSRCRPM createBINRPM buildRPM: cleanRPM createSRCRPM createBINRPM
  

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