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

Diff for /pegasus/rpm/RPMMakefile between version 1.1.2.3 and 1.6.16.1

version 1.1.2.3, 2007/05/18 17:22:16 version 1.6.16.1, 2008/11/19 23:43:44
Line 38 
Line 38 
 ############################################################################### ###############################################################################
  
  
   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)
 BRANCH:=$(PEGASUS_BUILD_BRANCH) BRANCH:=$(PEGASUS_BUILD_BRANCH)
 RPM:=rpm RPM:=rpm
   ifndef PEGASUS_RPM_BUILD_DEBUG
 RPMBUILD:=rpmbuild RPMBUILD:=rpmbuild
   else
       RPMBUILD:=rpmbuild -vv
   endif
 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)
 REMOVE_PEGASUS_DIRECTORY:=$(RM) -Rf pegasus.old; $(MV) pegasus pegasus.old  CIMSERVER_START_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver
   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)
Line 68 
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 120 
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 138 
Line 141 
         $(USAGE)"                       rpm from the source rpm"         $(USAGE)"                       rpm from the source rpm"
         $(USAGE)"buildRPM             - createSRCRPM createBINRPM"         $(USAGE)"buildRPM             - createSRCRPM createBINRPM"
         $(USAGE)"buildall             - exportSRC buildRPM"         $(USAGE)"buildall             - exportSRC buildRPM"
         $(USAGE)"list                 - list the installed pegasus rpms"          $(USAGE)"list                 - list installed tog-pegasus rpms"
         $(USAGE)"clean                - cleans build and target directories"          $(USAGE)"tests                - runs sample tests and test rpm tests"
           $(USAGE)"install              - installs tog-pegasus core and devel rpms"
           $(USAGE)"world                - cleanRPM buildall install tests"
           $(USAGE)"cleanRPM             - uninstalls tog-pegasus rpms"
         $(USAGE)""         $(USAGE)""
         $(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 174 
Line 183 
         @$(RPM) -i $(PEGASUS_RPM_DIRECTORY)/SRPMS/$(SRC_RPM)         @$(RPM) -i $(PEGASUS_RPM_DIRECTORY)/SRPMS/$(SRC_RPM)
         @$(RPMBUILD) -bb --define 'LINUX_VERSION $(PEGASUS_DISTRO_SUFFIX)' --define 'PEGASUS_BUILD_TEST_RPM 1' $(PEGASUS_RPM_DIRECTORY)/SPECS/tog-pegasus.spec         @$(RPMBUILD) -bb --define 'LINUX_VERSION $(PEGASUS_DISTRO_SUFFIX)' --define 'PEGASUS_BUILD_TEST_RPM 1' $(PEGASUS_RPM_DIRECTORY)/SPECS/tog-pegasus.spec
  
 buildRPM: clean createSRCRPM createBINRPM  
   
 buildall: exportSRC buildRPM  
   
 list: list:
         @$(RPM) -qa|$(GREP) tog-pegasus         @$(RPM) -qa|$(GREP) tog-pegasus
  
 clean:  tests:
           # Start cimserver
           -$(CIMSERVER_STOP_SERVICE)
           $(CIMSERVER_START_SERVICE)
           $(call checkForCores,./,-maxdepth 1)
   
           # Run some sanity tests
           # osinfo, cimserver -v, cimprovider -l -s, cimconfig -l -c etc
           @$(ECHO) "+++++ Running sanity checks +++++"
           @$(ECHO) "+++++ Running osinfo +++++"
           $(PEGASUS_BIN_DIR)/osinfo
           $(call checkForCores,./,-maxdepth 1)
   
           @$(ECHO) "+++++ Running cimserver -v +++++"
           $(PEGASUS_SBIN_DIR)/cimserver -v
           $(call checkForCores,./,-maxdepth 1)
   
           @$(ECHO) "+++++ Running cimconfig +++++"
           $(PEGASUS_SBIN_DIR)/cimconfig -l -c
           $(call checkForCores,./,-maxdepth 1)
   
           @$(ECHO) "+++++ Running cimprovider +++++"
           $(PEGASUS_BIN_DIR)/cimprovider -l -s
           $(call checkForCores,./,-maxdepth 1)
   
           @$(ECHO) "+++++ Stopping cimserver +++++"
           @$(CIMSERVER_STOP_SERVICE)
           $(call checkForCores,./,-maxdepth 1)
   
           @$(ECHO) "+++++ Starting cimserver +++++"
           $(CIMSERVER_START_SERVICE)
           $(call checkForCores,./,-maxdepth 1)
   
           # Run samples
           @$(ECHO) "+++++ Running samples +++++"
           $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile
           $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile setupSDK
           $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile testSDK
           $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile unsetupSDK
           $(call checkForCores,$(PEGASUS_SAMPLES_DIR),)
   
           # Install the test RPM after running SDK tests. This is because
           # the test RPM over-writes the repository.
           @$(ECHO) "+++++ Installing Test RPM +++++"
           $(RPM) -ih $(PEGASUS_RPM_DIRECTORY)/RPMS/$(PLATFORM)/$(TEST_RPM)
           $(MAKE) --directory=$(PEGASUS_TEST_DIR) -f Makefile setupTEST
           $(MAKE) --directory=$(PEGASUS_TEST_DIR) -f Makefile tests
           $(call checkForCores,$(PEGASUS_TEST_DIR),)
   
   # Install rpms
   install:
           @$(ECHO) "+++++ Installing RPMs +++++"
           $(RPM) -ih $(PEGASUS_RPM_DIRECTORY)/RPMS/$(PLATFORM)/$(CORE_RPM)
           $(RPM) -ih $(PEGASUS_RPM_DIRECTORY)/RPMS/$(PLATFORM)/$(SDK_RPM)
           $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
   
   cleanRPM:
         -$(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
   
   buildall: exportSRC buildRPM
  
   world: buildall install tests

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