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

Diff for /pegasus/Makefile between version 1.36 and 1.57.10.2

version 1.36, 2006/01/30 16:16:16 version 1.57.10.2, 2013/10/01 20:58:28
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; VERITAS Software Corporation; The Open Group.  
 #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; Symantec Corporation; The Open Group.  
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 # Pegasus top level make file # Pegasus top level make file
 # see the usage rule for options # see the usage rule for options
  
Line 36 
Line 34 
 include $(ROOT)/env_var.status include $(ROOT)/env_var.status
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
   ## Include mu in the clean structure
   ## This required because mu is not part of the hiearchial build
   ##structure.  It is built with the buildmu target.  Adding this
   ## variable allows it to be cleaned with the normal clean target.
   RECURSE_EXTRA_CLEAN_DIRS += src/utils/mu
   
 # This is a recurse make file # This is a recurse make file
 # Defines subdirectorys to go to recursively  # Defines subdirectories to go to recursively
   
   DIRS = src
  
 # DIRS = src cgi  TEST_DIRS = test
 DIRS = src test rpm 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
  
 defaultrule: all setupdevserver  defaultrule: cimprovagt32 all setupdevserver
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
  
Line 72 
Line 77 
         $(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 82 
Line 86 
         $(USAGE)"                      $(PEGASUS_HOME)/lib"         $(USAGE)"                      $(PEGASUS_HOME)/lib"
         $(USAGE)"                      $(PEGASUS_HOME)/obj"         $(USAGE)"                      $(PEGASUS_HOME)/obj"
         $(USAGE)"buildmu             - builds the mu utility"         $(USAGE)"buildmu             - builds the mu utility"
           $(USAGE)"buildclientlibs     - Build only the Client and Common libraries"
         $(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)"repositoryclean     - removes the complete repository"
         $(USAGE)"repositoryclean     - cleans the 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)
           $(USAGE)"webadmin            - build/config webadmin"
         $(USAGE)         $(USAGE)
         $(USAGE)"--------------------"         $(USAGE)"--------------------"
         $(USAGE)"Quick start:"         $(USAGE)"Quick start:"
Line 107 
Line 114 
         $(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
         $(USAGE)         $(USAGE)
         $(USAGE)"The $(words $(VALID_PLATFORMS)) valid platforms are:"         $(USAGE)"The $(words $(VALID_PLATFORMS)) valid platforms are:"
Line 154 
Line 158 
 #----------------------- #-----------------------
 # build target: builds all source # build target: builds all source
 # #
 build: depend all setupdevserver  build: cimprovagt32depend cimprovagt32 depend renameinterop all setupdevserver
  
 #------------------------ #------------------------
 # rebuild target is being deprecated instead use "make new build" # rebuild target is being deprecated instead use "make new build"
Line 163 
Line 167 
         @$(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 177 
Line 181 
 # make new build # make new build
 # make new world # make new world
  
 new: clean repositoryclean  new: cimprovagt32clean clean repositoryclean
  
 #----------------------- #-----------------------
 # world targets: builds everything and dependent on which target may do testing # world targets: builds everything and dependent on which target may do testing
 # #
 #       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
  
   ############################
   #
   # rules for building 32 bit provider agent
   #
   cimprovagt32depend: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) --directory=$(ROOT) -f Makefile.cimprovagt32 depend
   endif
   cimprovagt32: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) --directory=$(ROOT) -f Makefile.cimprovagt32
   endif
   
   cimprovagt32clean: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) --directory=$(ROOT) -f Makefile.cimprovagt32 clean
   endif
  
 ############################ ############################
 # #
Line 211 
Line 230 
 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 223 
Line 239 
 testusage2: FORCE testusage2: FORCE
         @ $(MAKE) -f TestMakefile usage2         @ $(MAKE) -f TestMakefile usage2
  
   stresstests:
           @$(ECHO) "Running OpenPegasus StressTests"
           @$(MAKE)  -f TestMakefile stresstests
           @$(ECHO) "+++++ OpenPegasus StressTests complete"
  
 ########################################################################## ##########################################################################
 # #
Line 231 
Line 250 
 # #
 #--------------------- #---------------------
 # 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 a depend implementation. This is a separate target because
   # it must be build before anything else and before the depend target is used
   # on some platforms. Note that mu is not used on all platforms.
   #
 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
  
   ##########################################################################
   #
   # renameinterop: This is with regard to PEP304, build time option.
   # There are many test cases and result files where namespace name
   # root/PG_InterOp is hardcoded. So this searches for root/PG_InterOp
   # and changes that to "interop" or "root/interop".
   #
   # This uses mu replace internally. The original files are all saved as
   # filename.save. These file can be restored by running
   # make -f Makefile.interop restore
   #
   renameinterop: buildmu
   ifeq ($(PEGASUS_INTEROP_NAMESPACE),root/interop)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile.interop replace
   endif
   ifeq ($(PEGASUS_INTEROP_NAMESPACE),interop)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile.interop replace
   endif
   
   # buildclientlibs: The libpegclient depends on libpegcommon library.
   # This build target can be used to build just these two libraries.
   # With this target, SLP support for clients is not enabled.
   #
   
   buildclientlibs: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Common -f Makefile
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile
   
 #---------------------- #----------------------
 # setupdevserver and cleandevserver are used to setup and clear the # setupdevserver and cleandevserver are used to setup and clear the
 # server configuration files needed to run the server in a development # server configuration files needed to run the server in a development
Line 243 
Line 292 
 # #
 setupdevserver: FORCE setupdevserver: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           -$(MAKE) --directory=$(PEGASUS_ROOT)/www -f Makefile setupwebadmin
         @$(ECHO) "PEGASUS Development Server Runtime Environment configured "         @$(ECHO) "PEGASUS Development Server Runtime Environment configured "
  
 cleandevserver: FORCE cleandevserver: FORCE
Line 255 
Line 305 
  
  
 #--------------------- #---------------------
 # The repository Target removes and rebuilds the CIM repository  # The repository target removes the entire repository and rebuilds the Pegasus
   # namespaces.  The repositoryServer target does not remove the repository
   # before building the Pegasus namespaces.  (The repositoryServer target in
   # TestMakefile *does* remove the repository first.)
  
 # 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: repositoryclean
         @ $(MAKE) "-SC" Schemas/Pegasus repository         @ $(MAKE) "-SC" Schemas/Pegasus repository
  
 repositoryclean: FORCE repositoryclean: FORCE
Line 267 
Line 320 
 repositoryServer: FORCE repositoryServer: FORCE
         @ $(MAKE) "-SC" Schemas/Pegasus repositoryServer         @ $(MAKE) "-SC" Schemas/Pegasus repositoryServer
  
   #---------------------
   # The testrepository and testrepositoryServer targets build the Pegasus test
   # namespaces.  A pre-existing repository is not removed.
   
 testrepository: FORCE testrepository: FORCE
         @ $(MAKE) "-SC" src/Providers/sample/Load repository         @ $(MAKE) "-SC" src/Providers/sample/Load repository
         @ $(MAKE) "-SC" test/wetest repository         @ $(MAKE) "-SC" test/wetest repository
Line 274 
Line 331 
         @ $(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)
           @ $(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 283 
Line 347 
         @ $(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
 removetestrepository: FORCE  ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         @ $(MAKE) "-SC" src/Providers/sample/Load removerepository          @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repositoryServer
         @ $(MAKE) "-SC" test/wetest removerepository  endif
         @ $(MAKE) "-SC" src/Clients/benchmarkTest/Load removerepository          @ $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/cimsub/tests/testscript \
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load removerepository              -f Makefile repositoryServer
   
 config:  
         @ $(ROOT)/SetConfig_EnvVar  
  
 rootbundle: rootbundle:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/cnv2rootbundle -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/cnv2rootbundle -f Makefile
  
   # DO NOT DELETE


Legend:
Removed from v.1.36  
changed lines
  Added in v.1.57.10.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2