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

Diff for /pegasus/mak/BuildMakefile between version 1.25.2.1 and 1.32

version 1.25.2.1, 2003/08/13 19:39:49 version 1.32, 2005/01/11 21:26:29
Line 21 
Line 21 
 ## ##
 ############################################################################### ###############################################################################
  
 include pegasus/mak/config.mak  include $(PEGASUS_ROOT)/mak/config.mak
  
 # There is a start command for cimserver but no stop today.  Because of problems with # There is a start command for cimserver but no stop today.  Because of problems with
 # the use of cimserver as a service, we simply used the start command to allow us to # the use of cimserver as a service, we simply used the start command to allow us to
Line 33 
Line 33 
   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)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = pegasus/src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
Line 44 
Line 43 
   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
   COPYMU = cp -f pegasus/src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = pegasus/src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
Line 55 
Line 53 
   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
   COPYMU = cp -f pegasus/src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = pegasus/src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
Line 66 
Line 63 
   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
   COPYMU = cp -f pegasus/src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = pegasus/src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
Line 83 
Line 79 
 buildmu: buildmu:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)         $(MKDIR) $(BIN_DIR)
         $(COPYMU)  
  
 cleanbuild: removeall recheckout buildmu all $(TESTS) cleanbuild: removeall recheckout buildmu all $(TESTS)
  
Line 97 
Line 92 
  
 rebuild: clean buildmu all tests rebuild: clean buildmu all tests
  
   rebuild-notest: clean buildmu all
   
 build: all tests build: all tests
  
   build-notest: all
   
 all: buildmu all: buildmu
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile all         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile all
Line 125 
Line 124 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
  
 poststarttests: poststarttests:
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/tests/Queries -f Makefile clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)         $(SLEEP)

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