(file) Return to BuildMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/BuildMakefile between version 1.16 and 1.21

version 1.16, 2002/04/08 13:02:52 version 1.21, 2003/05/28 20:47:44
Line 28 
Line 28 
 # get on with testing. I know of no CLI to stop a window started with start so that # get on with testing. I know of no CLI to stop a window started with start so that
 # field is blank.  ks 7 April 2002 # field is blank.  ks 7 April 2002
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
   CIMSERVER_START_SERVICE = start cimserver -l    CIMSERVER_START_SERVICE = cimserver -start
   CIMSERVER_STOP_SERVICE =    CIMSERVER_STOP_SERVICE = cimserver -stop
   SLEEP =   SLEEP =
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu.exe   MUEXE = mu.exe
   COPYMU = copy pegasus\src\utils\mu\$(MUEXE) /y $(MUEXE)   COPYMU = copy pegasus\src\utils\mu\$(MUEXE) /y $(MUEXE)
   MKDIR = pegasus/src/utils/mu/mu mkdirhier   MKDIR = pegasus/src/utils/mu/mu mkdirhier
   TESTS = prestarttests    TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)  ifeq ($(OS),HPUX)
   CIMSERVER_START_SERVICE = cimserver -d    CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/sh"}'    CIMSERVER_STOP_SERVICE = cimserver -s
   SLEEP = sleep 5   SLEEP = sleep 5
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
   MUEXE = mu   MUEXE = mu
Line 50 
Line 50 
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)
   CIMSERVER_START_SERVICE = cimserver -d    CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'
   SLEEP = sleep 5   SLEEP = sleep 5
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
Line 61 
Line 61 
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
   CIMSERVER_START_SERVICE = cimserver -d    CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'
   SLEEP = sleep 5   SLEEP = sleep 5
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
Line 110 
Line 110 
 clean: clean:
         $(MAKE) --directory=pegasus -f Makefile clean         $(MAKE) --directory=pegasus -f Makefile clean
  
   repositoryServer:
           $(CIMSERVER_STOP_SERVICE)
           $(SLEEP)
           $(RMDIRHIER) $(REPOSITORY_ROOT)
           $(CIMSERVER_START_SERVICE)
           $(SLEEP)
           $(MAKE) --directory=pegasus -f Makefile repositoryServer
           $(MAKE) --directory=pegasus -f Makefile testrepositoryServer
  
 prestarttests: prestarttests:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
Line 124 
Line 132 
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)         $(SLEEP)
         $(MAKE) --directory=pegasus -f Makefile poststarttests         $(MAKE) --directory=pegasus -f Makefile poststarttests
         @ $(CIMSERVER_STOP_SERVICE)  
         $(SLEEP)  
  
 tests: $(TESTS) tests: $(TESTS)
   ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
           $(CIMSERVER_STOP_SERVICE)
           $(MAKE) --directory=src/Server -f Makefile uninstall
   endif
         @ echo Finished Tests         @ echo Finished Tests
  
 ############################################################################### ###############################################################################


Legend:
Removed from v.1.16  
changed lines
  Added in v.1.21

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2