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

Diff for /pegasus/Makefile between version 1.40 and 1.46

version 1.40, 2006/10/20 19:19:45 version 1.46, 2008/06/18 05:58:37
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  Schemas
   
   TEST_DIRS = test
  
 # 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
Line 72 
Line 74 
         $(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 95 
         $(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 109 
         $(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 165 
Line 161 
         @$(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 182 
 # #
 #       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 207 
 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 238 
Line 229 
 # buildmu target: build mu the make utility that among other things # buildmu target: build mu the make utility that among other things
 #                 includes depend #                 includes depend
 buildmu: FORCE buildmu: FORCE
         $(MKDIRHIER) $(BIN_DIR)  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
  
 #---------------------- #----------------------
Line 282 
Line 272 
         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repository         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repository
         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repository         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repository
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repository         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repository
   ifeq ($(PEGASUS_ENABLE_CQL),true)
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository
   endif
 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
Line 296 
Line 288 
         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repositoryServer         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repositoryServer
         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repositoryServer
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repositoryServer         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repositoryServer
   ifeq ($(PEGASUS_ENABLE_CQL),true)
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer
   endif
 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

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