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

Diff for /pegasus/mak/BuildMakefile between version 1.19 and 1.22.2.1

version 1.19, 2002/07/15 06:22:11 version 1.22.2.1, 2003/06/25 16:29:06
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    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  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)  
   CIMSERVER_START_SERVICE = cimserver  
   CIMSERVER_STOP_SERVICE = cimserver -s  
   SLEEP = sleep 5  
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old  
   MUEXE = mu  
   COPYMU = cp -f pegasus/src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)  
   MKDIR = pegasus/src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  ifeq ($(OS),HPUX)
   CIMSERVER_START_SERVICE = cimserver   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 = 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 60 
Line 49 
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)  ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
   CIMSERVER_START_SERVICE = cimserver   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
Line 81 
Line 70 
         @ echo "Specify desired makefile option (i.e., cleanbuild, rebuild)"         @ echo "Specify desired makefile option (i.e., cleanbuild, rebuild)"
  
 buildmu: buildmu:
         $(MAKE) --directory=pegasus/src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)         $(MKDIR) $(BIN_DIR)
         $(COPYMU)         $(COPYMU)
  
Line 100 
Line 89 
 build: all tests build: all tests
  
 all: buildmu all: buildmu
         $(MAKE) --directory=pegasus -f Makefile depend          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
         $(MAKE) --directory=pegasus -f Makefile all          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile all
  
 doc: doc:
         $(MAKE) --directory=pegasus/doc/ProviderSpec -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
         $(MAKE) --directory=pegasus/doc/DevManual -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 clean: clean:
         $(MAKE) --directory=pegasus -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
  
 repositoryServer: repositoryServer:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
Line 116 
Line 105 
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)         $(SLEEP)
         $(MAKE) --directory=pegasus -f Makefile repositoryServer          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
         $(MAKE) --directory=pegasus -f Makefile testrepositoryServer          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
  
 prestarttests: prestarttests:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP)         $(SLEEP)
         $(MAKE) --directory=pegasus -f Makefile repository          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
         $(MAKE) --directory=pegasus -f Makefile testrepository          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=pegasus -f Makefile tests          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         $(MAKE) --directory=pegasus/src/Server -f Makefile install          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install
  
 poststarttests: poststarttests:
         $(MAKE) --directory=pegasus/test/wetest -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)         $(SLEEP)
         $(MAKE) --directory=pegasus -f Makefile poststarttests          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
  
 tests: $(TESTS) tests: $(TESTS)
   ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
           $(CIMSERVER_STOP_SERVICE)
           $(MAKE) --directory=$(PEGASUS_ROOT)src/Server -f Makefile uninstall
   endif
         @ echo Finished Tests         @ echo Finished Tests
  
 ############################################################################### ###############################################################################

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