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

Diff for /pegasus/Makefile between version 1.39 and 1.42.14.4

version 1.39, 2006/10/04 19:49:11 version 1.42.14.4, 2007/08/13 10:57:29
Line 40 
Line 40 
 # Defines subdirectorys to go to recursively # Defines subdirectorys to go to recursively
  
 # DIRS = src cgi # DIRS = src cgi
 DIRS = src test rpm Schemas  DIRS = src test Schemas
  
 # Define the inclusion of the recurse.mak file to execute the next # Define the inclusion of the recurse.mak file to execute the next
 # level of makefiles defined by the DIRS variable # level of makefiles defined by the DIRS variable
   ifneq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)
 defaultrule: all setupdevserver defaultrule: all setupdevserver
   else
   defaultrule: all dacim setupdevserver
   endif
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
  
Line 72 
Line 75 
         $(USAGE)"DEFAULT RULE        - all, setupdevserver"         $(USAGE)"DEFAULT RULE        - all, setupdevserver"
         $(USAGE)"new                 - clean repositoryclean"         $(USAGE)"new                 - clean repositoryclean"
         $(USAGE)"build               - depend all, setupdevserver"         $(USAGE)"build               - depend all, setupdevserver"
         $(USAGE)"smallworld          - build unittests serverquicktests"  
         $(USAGE)"world               - build unittests servertests"         $(USAGE)"world               - build unittests servertests"
         $(USAGE)         $(USAGE)
         $(USAGE)"Functional rules - Other rules to achieve specified results"         $(USAGE)"Functional rules - Other rules to achieve specified results"
Line 94 
Line 96 
         $(USAGE)"Test rules (accessable here but implemented in TestMakefile)"         $(USAGE)"Test rules (accessable here but implemented in TestMakefile)"
         $(USAGE)"alltests            - unittests and servertests"         $(USAGE)"alltests            - unittests and servertests"
         $(USAGE)"unittests           - runs the unit functional test"         $(USAGE)"unittests           - runs the unit functional test"
         $(USAGE)"serverquicktests    - runs quick server tests"  
         $(USAGE)"servertests         - runs basic server tests"         $(USAGE)"servertests         - runs basic server tests"
         $(USAGE)"perftests           - runs basic server performance tests"         $(USAGE)"perftests           - runs basic server performance tests"
         $(USAGE)"standardtests       - runs server extended tests"         $(USAGE)"standardtests       - runs server extended tests"
Line 109 
Line 110 
         $(USAGE)"  set PEGASUS_PLATFORM=<your platofrm>"         $(USAGE)"  set PEGASUS_PLATFORM=<your platofrm>"
         $(USAGE)"  set PEGASUS_ROOT=<location of your pegasus source>"         $(USAGE)"  set PEGASUS_ROOT=<location of your pegasus source>"
         $(USAGE)"  set PEGASUS_HOME=<build output location"         $(USAGE)"  set PEGASUS_HOME=<build output location"
         $(USAGE)"  make smallworld"          $(USAGE)"  make world"
         $(USAGE)         $(USAGE)
         $(USAGE)"  This will build everthing with a default configuration"         $(USAGE)"  This will build everthing with a default configuration"
         $(USAGE)"  and run some tests."          $(USAGE)"  and run the automated tests."
         $(USAGE)  
         $(USAGE)"  For a more extensive test use \"make world\""  
         $(USAGE)         $(USAGE)
         $(USAGE)"--------------------"         $(USAGE)"--------------------"
         $(USAGE)"Examples:"         $(USAGE)"Examples:"
         $(USAGE)"  After \"cvs checkout\" of new tree:    make smallworld"          $(USAGE)"  After \"cvs checkout\" of new tree:    make world"
         $(USAGE)"                          OR           make world"  
         $(USAGE)         $(USAGE)
         $(USAGE)"  After changes to include files:      make"         $(USAGE)"  After changes to include files:      make"
         $(USAGE)         $(USAGE)
         $(USAGE)"  After changes to the files included: make build"         $(USAGE)"  After changes to the files included: make build"
         $(USAGE)         $(USAGE)
         $(USAGE)"  After \"cvs update\" or to start over: make new smallworld"          $(USAGE)"  After \"cvs update\" or to start over: make new world"
         $(USAGE)"                          OR           make new world"  
         $(USAGE)         $(USAGE)
  
 listplatforms: FORCE listplatforms: FORCE
Line 157 
Line 154 
 # build target: builds all source # build target: builds all source
 # #
 build: depend all setupdevserver build: depend all setupdevserver
   ifeq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)
           $(MAKE) --directory=$(PEGASUS_ROOT) dacim
   endif
   
  
 #------------------------ #------------------------
 # rebuild target is being deprecated instead use "make new build" # rebuild target is being deprecated instead use "make new build"
Line 165 
Line 166 
         @$(ECHO) "==============================================================================="         @$(ECHO) "==============================================================================="
         @$(ECHO) "Makefile: The rebuild target is being deprecated."         @$(ECHO) "Makefile: The rebuild target is being deprecated."
         @$(ECHO) "          Use \"make usage\" for a description of the usage model."         @$(ECHO) "          Use \"make usage\" for a description of the usage model."
         @$(ECHO) "          Consider using \"make new smallworld\" ."          @$(ECHO) "          Consider using \"make new world\" ."
         @$(ECHO) "          Invoking the old rebuild rule now."         @$(ECHO) "          Invoking the old rebuild rule now."
         @$(ECHO) "==============================================================================="         @$(ECHO) "==============================================================================="
  
Line 186 
Line 187 
 # #
 #       Typically used after a fresh checkout from CVS #       Typically used after a fresh checkout from CVS
  
 smallworld: build s_unittests serverquicktests  
   
 world: build s_unittests servertests world: build s_unittests servertests
  
  
Line 213 
Line 212 
 standardtests: FORCE standardtests: FORCE
         @ $(MAKE) -f TestMakefile standardtests         @ $(MAKE) -f TestMakefile standardtests
  
 serverquicktests: FORCE  
         @ $(MAKE) -f TestMakefile serverquicktests  
   
 alltests: FORCE alltests: FORCE
         @ $(MAKE) -f TestMakefile alltests         @ $(MAKE) -f TestMakefile alltests
  
Line 258 
Line 254 
         - $(RMDIRHIER) $(PEGASUS_HOME)/lib         - $(RMDIRHIER) $(PEGASUS_HOME)/lib
         - $(RMDIRHIER) $(PEGASUS_HOME)/obj         - $(RMDIRHIER) $(PEGASUS_HOME)/obj
  
   dacim: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2 clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2 depend
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Repository clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Repository -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManager2 clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManager2 -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManagerService clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManagerService -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true
           $(MAKE) --directory src/Clients/cimconfig clean
           $(MAKE) --directory src/Clients/cimconfig -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true
           @$(ECHO) "PEGASUS built with direct access CIM. "
   
   removedacim: rmv_dacim build
   
   rmv_dacim: FORCE
           @$(TOUCH) $(PEGASUS_ROOT)/src/Pegasus/Client/CIMClientRep.cpp
  
 #--------------------- #---------------------
 # The repository Target removes and rebuilds the base repository. It # The repository Target removes and rebuilds the base repository. It
Line 286 
Line 300 
 ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true) ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repository         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repository
 endif endif
           @ $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/cimsub/tests/testscript \
               -f Makefile repository
  
 testrepositoryServer: FORCE testrepositoryServer: FORCE
         @ $(MAKE) "-SC" src/Providers/sample/Load repositoryServer         @ $(MAKE) "-SC" src/Providers/sample/Load repositoryServer
Line 298 
Line 314 
 ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true) ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repositoryServer
 endif endif
           @ $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/cimsub/tests/testscript \
               -f Makefile repositoryServer
  
 removetestrepository: FORCE removetestrepository: FORCE
         @ $(MAKE) "-SC" src/Providers/sample/Load removerepository         @ $(MAKE) "-SC" src/Providers/sample/Load removerepository
         @ $(MAKE) "-SC" test/wetest removerepository         @ $(MAKE) "-SC" test/wetest removerepository
         @ $(MAKE) "-SC" src/Clients/benchmarkTest/Load removerepository         @ $(MAKE) "-SC" src/Clients/benchmarkTest/Load removerepository
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load removerepository         @ $(MAKE) "-SC" src/Providers/TestProviders/Load removerepository
           @ $(MAKE) "-SC" src/Clients/cimsub/tests/testscript removerepository
  
 config: config:
         @ $(ROOT)/SetConfig_EnvVar         @ $(ROOT)/SetConfig_EnvVar

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