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

Diff for /pegasus/rpm/RPMMakefile between version 1.16 and 1.17

version 1.16, 2008/12/16 18:55:38 version 1.17, 2009/12/15 10:52:32
Line 54 
Line 54 
 GREP:=grep GREP:=grep
 ECHO:=echo ECHO:=echo
 ECHO-E:=echo -e ECHO-E:=echo -e
 TOG_INSTALLED_RPMS:=$(shell $(RPM) -qa|grep tog-pegasus)  TOG_INSTALLED_RPMS:=$(shell $(RPM) -qa|grep $(PEGASUS_FLAVOR)-pegasus)
  
 ifdef PEGASUS_BUILD_BRANCH ifdef PEGASUS_BUILD_BRANCH
     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)
Line 117 
Line 117 
   endif   endif
   TOG_PEGASUS_DIR:=""   TOG_PEGASUS_DIR:=""
 else else
   TOG_PEGASUS_DIR:=tog-pegasus    TOG_PEGASUS_DIR:=$(PEGASUS_FLAVOR)-pegasus
 endif endif
  
 VERSION:=$(PEGASUS_PRODUCT_VERSION)-$(PEGASUS_PACKAGE_VERSION) VERSION:=$(PEGASUS_PRODUCT_VERSION)-$(PEGASUS_PACKAGE_VERSION)
 CORE_RPM:=tog-pegasus-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm  CORE_RPM:=$(PEGASUS_FLAVOR)-pegasus-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
 SDK_RPM:=tog-pegasus-devel-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm  SDK_RPM:=$(PEGASUS_FLAVOR)-pegasus-devel-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
 TEST_RPM:=tog-pegasus-test-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm  TEST_RPM:=$(PEGASUS_FLAVOR)-pegasus-test-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
 SRC_RPM:=tog-pegasus-$(VERSION).src.rpm  SRC_RPM:=$(PEGASUS_FLAVOR)-pegasus-$(VERSION).src.rpm
 RPM_SRC_DIR:=$(shell echo tog-pegasus-$(PEGASUS_PRODUCT_VERSION))  RPM_SRC_DIR:=$(shell echo $(PEGASUS_FLAVOR)-pegasus-$(PEGASUS_PRODUCT_VERSION))
  
 USAGE = @$(ECHO) $(1) USAGE = @$(ECHO) $(1)
  
Line 169 
Line 169 
 endef endef
  
 define startCIMServer define startCIMServer
         @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \          @/etc/init.d/$(PEGASUS_FLAVOR)-pegasus status > /dev/null 2>&1; \
         if [ $$? != 0 ]; then \         if [ $$? != 0 ]; then \
             /etc/init.d/tog-pegasus start; \              /etc/init.d/$(PEGASUS_FLAVOR)-pegasus start; \
         fi         fi
 endef endef
  
 define stopCIMServer define stopCIMServer
         @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \          @/etc/init.d/$(PEGASUS_FLAVOR)-pegasus status > /dev/null 2>&1; \
         if [ $$? == 0 ]; then \         if [ $$? == 0 ]; then \
             /etc/init.d/tog-pegasus stop; \              /etc/init.d/$(PEGASUS_FLAVOR)-pegasus stop; \
         fi         fi
 endef endef
  
Line 205 
Line 205 
         @$(MV) pegasus $(RPM_SRC_DIR)         @$(MV) pegasus $(RPM_SRC_DIR)
         @$(CP) $(RPM_SRC_DIR)/rpm/tog-pegasus.spec \         @$(CP) $(RPM_SRC_DIR)/rpm/tog-pegasus.spec \
             $(PEGASUS_RPM_DIRECTORY)/SPECS             $(PEGASUS_RPM_DIRECTORY)/SPECS
         @tar czf tog-pegasus-$(VERSION).tar.gz $(RPM_SRC_DIR)          @tar czf $(PEGASUS_FLAVOR)-pegasus-$(VERSION).tar.gz $(RPM_SRC_DIR)
         @$(CP) tog-pegasus-$(VERSION).tar.gz $(PEGASUS_RPM_DIRECTORY)/SOURCES/$(TOG_PEGASUS_DIR)          @$(CP) $(PEGASUS_FLAVOR)-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
  
 createBINRPM: createBINRPM:
Line 214 
Line 214 
         @$(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
  
 list: list:
         @$(RPM) -qa|$(GREP) tog-pegasus          @$(RPM) -qa|$(GREP) $(PEGASUS_FLAVOR)-pegasus
  
 tests: tests:
         # Start cimserver         # Start cimserver
Line 273 
Line 273 
         $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts         $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
  
 cleanRPM: cleanRPM:
         $(call removeRPM,tog-pegasus-test);          $(call removeRPM,$(PEGASUS_FLAVOR)-pegasus-test);
         -$(call startCIMServer)         -$(call startCIMServer)
         $(call removeRPM,tog-pegasus-devel);          $(call removeRPM,$(PEGASUS_FLAVOR)-pegasus-devel);
         $(call removeRPM,tog-pegasus);          $(call removeRPM,$(PEGASUS_FLAVOR)-pegasus);
         -$(RM) -Rf $(RPM_SRC_DIR).old         -$(RM) -Rf $(RPM_SRC_DIR).old
 ifneq ($(wildcard $(RPM_SRC_DIR)), ) ifneq ($(wildcard $(RPM_SRC_DIR)), )
         $(MV) $(RPM_SRC_DIR) $(RPM_SRC_DIR).old         $(MV) $(RPM_SRC_DIR) $(RPM_SRC_DIR).old

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