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

Diff for /pegasus/Makefile between version 1.36.4.1 and 1.43.2.4

version 1.36.4.1, 2006/04/07 21:15:02 version 1.43.2.4, 2007/09/26 16:13:52
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  
   ifeq ($(OS_TYPE),vxworks)
       DIRS = \
           src/Pegasus/Common \
           src/Pegasus/Common/tests \
           src/Pegasus/Config \
           src/Pegasus/Query/QueryCommon \
           src/Pegasus/WQL \
           src/Pegasus/CQL \
           src/Pegasus/Query/QueryExpression \
           src/Pegasus/Security/UserManager \
           src/Pegasus/Client \
           src/Service \
           src/Pegasus/Provider \
           src/Pegasus/Repository \
           src/Pegasus/Repository/tests \
           src/Pegasus/Server/ProviderRegistrationManager \
           src/Pegasus/ProviderManager2 \
           src/Pegasus/ProviderManager2/Default \
           src/Pegasus/ExportServer \
           src/Pegasus/ProviderManagerService \
           src/Pegasus/Security/Authentication \
           src/Pegasus/HandlerService \
           src/Pegasus/IndicationService \
           src/Pegasus/ControlProviders/InteropProvider \
           src/Pegasus/ControlProviders/Statistic \
           src/Pegasus/ControlProviders/QueryCapabilitiesProvider \
           src/Pegasus/ControlProviders/ProviderRegistrationProvider \
           src/Pegasus/ControlProviders/NamespaceProvider \
           src/Pegasus/ControlProviders/ConfigSettingProvider \
           src/Pegasus/ControlProviders/UserAuthProvider \
           src/Pegasus/Server \
           vxworks/cimserver
   
   XSOURCES = \
           src/Providers/ManagedSystem/ComputerSystem \
           src/Providers/ManagedSystem/Process \
           src/Providers/ManagedSystem/Processor \
           src/Providers/ManagedSystem/IP \
           src/Providers/ManagedSystem/ComputerSystem
   else
       DIRS = src test Schemas
   endif
  
 # 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
  
   ifeq ($(OS_TYPE),vxworks)
       defaultrule: all
   else
 defaultrule: all setupdevserver defaultrule: all setupdevserver
   endif
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
  
Line 72 
Line 118 
         $(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 84 
Line 129 
         $(USAGE)"buildmu             - builds the mu utility"         $(USAGE)"buildmu             - builds the mu utility"
         $(USAGE)"setupdevserver      - setup the development server env"         $(USAGE)"setupdevserver      - setup the development server env"
         $(USAGE)"cleandevserver      - cleans the development server env"         $(USAGE)"cleandevserver      - cleans the development server env"
         $(USAGE)"repository          - builds the base repository"          $(USAGE)"repository          - builds the base repository. Does not remove other"
           $(USAGE)"                      namespaces than the base namespaces."
         $(USAGE)"testrepository      - builds items for the test suites into the repository"         $(USAGE)"testrepository      - builds items for the test suites into the repository"
         $(USAGE)"removetestrepository- removes test items from the repository"         $(USAGE)"removetestrepository- removes test items from the repository"
         $(USAGE)"repositoryclean     - cleans the repository"          $(USAGE)"repositoryclean     - removes the complete repository"
         $(USAGE)"listplatforms       - List all valid platforms"         $(USAGE)"listplatforms       - List all valid platforms"
         $(USAGE)         $(USAGE)
         $(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"
         $(USAGE)"testusage           - TestMakefile usage"         $(USAGE)"testusage           - TestMakefile usage"
         $(USAGE)"testusage2          - TestMakefile usage2"         $(USAGE)"testusage2          - TestMakefile usage2"
         $(USAGE)"stresstests         - runs the default stresstests"          $(USAGE)"stresstests         - Runs the default stresstests"
         $(USAGE)         $(USAGE)
         $(USAGE)"--------------------"         $(USAGE)"--------------------"
         $(USAGE)"Quick start:"         $(USAGE)"Quick start:"
Line 108 
Line 153 
         $(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 164 
Line 205 
         @$(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 185 
Line 226 
 # #
 #       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 212 
Line 251 
 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 225 
Line 261 
         @ $(MAKE) -f TestMakefile usage2         @ $(MAKE) -f TestMakefile usage2
  
 stresstests: stresstests:
         @$(MAKE) "-SC" test/StressTests clean          @$(ECHO) "Running OpenPegasus StressTests"
         @$(ECHO) "Building PEGASUS StressTests"          @$(MAKE)  -f TestMakefile stresstests
         @$(MAKE) "-SC" test/StressTests          @$(ECHO) "+++++ OpenPegasus StressTests complete"
         @$(MAKE) "-SC" test/StressTests/testClient clean  
         @$(MAKE) "-SC" test/StressTests/testClient  
         @$(MAKE) "-SC" test/StressTests/testClient/ModelWalkStressClient clean  
         @$(MAKE) "-SC" test/StressTests/testClient/ModelWalkStressClient  
         @$(MAKE) "-SC" test/StressTests/testClient/WrapperStressClient clean  
         @$(MAKE) "-SC" test/StressTests/testClient/WrapperStressClient  
         @$(MAKE) "-SC" test/StressTests/tests stresstests  
   
   
  
 ########################################################################## ##########################################################################
 # #
Line 268 
Line 295 
  
  
 #--------------------- #---------------------
 # The repository Target removes and rebuilds the CIM repository  # The repository Target removes and rebuilds the base repository. It
   # does not remove all possible namespaces.  See
   # Schemas/Pegasus/Makefile for details. The repository clean has the
   # same limitation
  
 # Note: Arguments must be quoted to preserve upper case characters in VMS. # Note: Arguments must be quoted to preserve upper case characters in VMS.
 repository: FORCE repository: FORCE
Line 287 
Line 317 
         @ $(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
   ifndef PEGASUS_DISABLE_CQL
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository
   endif
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
           @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repository
   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 296 
Line 333 
         @ $(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
   ifndef PEGASUS_DISABLE_CQL
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer
   endif
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
           @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repositoryServer
   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
  
 rootbundle: rootbundle:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/cnv2rootbundle -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/cnv2rootbundle -f Makefile
   
   

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