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

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

version 1.6.16.1, 2008/11/19 23:43:44 version 1.11, 2008/11/25 22:03:45
Line 56 
Line 56 
 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)
 CIMSERVER_START_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver  
 CIMSERVER_STOP_SERVICE:=$(PEGASUS_SBIN_DIR)/cimserver -s  
  
 ifdef PEGASUS_BUILD_BRANCH ifdef PEGASUS_BUILD_BRANCH
     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)
Line 128 
Line 126 
 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
 SRC_RPM:=tog-pegasus-$(VERSION).src.rpm SRC_RPM:=tog-pegasus-$(VERSION).src.rpm
   RPM_SRC_DIR:=$(shell echo tog-pegasus-$(PEGASUS_PRODUCT_VERSION))
  
 USAGE = @$(ECHO) $(1) USAGE = @$(ECHO) $(1)
  
Line 164 
Line 163 
                 exit 1; fi                 exit 1; fi
 endef endef
  
   define removeRPM
           @if [ -n "`rpm -qa | grep $1-[0-9]`" ]; then \
              rpm -e `rpm -qa | grep $1-[0-9]`; \
           fi
   endef
   
   define startCIMServer
           @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \
           if [ $$? != 0 ]; then \
               /etc/init.d/tog-pegasus start; \
           fi
   endef
   
   define stopCIMServer
           @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \
           if [ $$? == 0 ]; then \
               /etc/init.d/tog-pegasus stop; \
           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
  
Line 173 
Line 193 
         @$(ECHO) "PEGASUS_PRODUCT_VERSION is not defined"         @$(ECHO) "PEGASUS_PRODUCT_VERSION is not defined"
         @exit 2         @exit 2
 endif endif
         @$(MV) pegasus tog-pegasus-$(PEGASUS_PRODUCT_VERSION)          @$(MV) pegasus $(RPM_SRC_DIR)
         @$(CP) tog-pegasus-$(PEGASUS_PRODUCT_VERSION)/rpm/tog-pegasus.spec $(PEGASUS_RPM_DIRECTORY)/SPECS          @$(CP) $(RPM_SRC_DIR)/rpm/tog-pegasus.spec \
         @tar czf tog-pegasus-$(VERSION).tar.gz tog-pegasus-$(PEGASUS_PRODUCT_VERSION)              $(PEGASUS_RPM_DIRECTORY)/SPECS
           @tar czf tog-pegasus-$(VERSION).tar.gz $(RPM_SRC_DIR)
         @$(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 188 
Line 209 
  
 tests: tests:
         # Start cimserver         # Start cimserver
         -$(CIMSERVER_STOP_SERVICE)          -$(call stopCIMServer)
         $(CIMSERVER_START_SERVICE)          $(call startCIMServer)
         $(call checkForCores,./,-maxdepth 1)         $(call checkForCores,./,-maxdepth 1)
  
         # Run some sanity tests         # Run some sanity tests
Line 212 
Line 233 
         $(call checkForCores,./,-maxdepth 1)         $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Stopping cimserver +++++"         @$(ECHO) "+++++ Stopping cimserver +++++"
         @$(CIMSERVER_STOP_SERVICE)          @$(call stopCIMServer)
         $(call checkForCores,./,-maxdepth 1)         $(call checkForCores,./,-maxdepth 1)
  
         @$(ECHO) "+++++ Starting cimserver +++++"         @$(ECHO) "+++++ Starting cimserver +++++"
         $(CIMSERVER_START_SERVICE)          $(call startCIMServer)
         $(call checkForCores,./,-maxdepth 1)         $(call checkForCores,./,-maxdepth 1)
  
         # Run samples         # Run samples
Line 243 
Line 264 
         $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts         $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
  
 cleanRPM: cleanRPM:
         -$(RPM) -e $(filter tog-pegasus-test%,$(TOG_INSTALLED_RPMS))          $(call removeRPM,tog-pegasus-test);
         -$(RPM) -e $(filter tog-pegasus-devel%,$(TOG_INSTALLED_RPMS))          -$(call startCIMServer)
         -$(RPM) -e $(filter tog-pegasus-2%,$(TOG_INSTALLED_RPMS))          $(call removeRPM,tog-pegasus-devel);
         -$(RM) -Rf tog-pegasus-$(PEGASUS_PRODUCT_VERSION).old          $(call removeRPM,tog-pegasus);
         -$(MV) tog-pegasus-$(PEGASUS_PRODUCT_VERSION) tog-pegasus-$(PEGASUS_PRODUCT_VERSION).old          -$(RM) -Rf $(RPM_SRC_DIR).old
   ifneq ($(wildcard $(RPM_SRC_DIR)), )
           $(MV) $(RPM_SRC_DIR) $(RPM_SRC_DIR).old
   endif
  
 buildRPM: cleanRPM createSRCRPM createBINRPM buildRPM: cleanRPM createSRCRPM createBINRPM
  

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