/[jscoverage]/trunk/js/config/config.mk
ViewVC logotype

Diff of /trunk/js/config/config.mk

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 459 by siliconforks, Tue Dec 9 03:37:47 2008 UTC revision 460 by siliconforks, Sat Sep 26 23:15:22 2009 UTC
# Line 155  Line 155 
155    
156  ifdef MOZ_MEMORY  ifdef MOZ_MEMORY
157  ifneq ($(OS_ARCH),WINNT)  ifneq ($(OS_ARCH),WINNT)
158  JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)  JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
159  endif  endif
160  endif  endif
161    
# Line 493  Line 493 
493  INCLUDES        += -I$(LIBXUL_DIST)/sdk/include  INCLUDES        += -I$(LIBXUL_DIST)/sdk/include
494  endif  endif
495    
496  # The entire tree should be subject to static analysis using the XPCOM  include $(topsrcdir)/config/static-checking-config.mk
 # script. Additional scripts may be added by specific subdirectories.  
   
 DEHYDRA_SCRIPT = $(topsrcdir)/xpcom/analysis/static-checking.js  
   
 DEHYDRA_MODULES = \  
   $(topsrcdir)/xpcom/analysis/final.js \  
   $(NULL)  
   
 TREEHYDRA_MODULES = \  
   $(topsrcdir)/xpcom/analysis/outparams.js \  
   $(topsrcdir)/xpcom/analysis/stack.js \  
   $(topsrcdir)/xpcom/analysis/flow.js \  
   $(NULL)  
   
 DEHYDRA_ARGS = \  
   --topsrcdir=$(topsrcdir) \  
   --objdir=$(DEPTH) \  
   --dehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(DEHYDRA_MODULES))) \  
   --treehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(TREEHYDRA_MODULES))) \  
   $(NULL)  
   
 DEHYDRA_FLAGS = -fplugin=$(DEHYDRA_PATH) -fplugin-arg='$(DEHYDRA_SCRIPT) $(DEHYDRA_ARGS)'  
   
 ifdef DEHYDRA_PATH  
 OS_CXXFLAGS += $(DEHYDRA_FLAGS)  
 endif  
497    
498  CFLAGS          = $(OS_CFLAGS)  CFLAGS          = $(OS_CFLAGS)
499  CXXFLAGS        = $(OS_CXXFLAGS)  CXXFLAGS        = $(OS_CXXFLAGS)
# Line 872  Line 846 
846  RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh  RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
847  endif  endif
848    
849    ifeq ($(OS_ARCH),OS2)
850    RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
851    endif
852    
853  #  #
854  # Java macros  # Java macros
855  #  #
# Line 882  Line 860 
860  ifdef MOZ_DEBUG  ifdef MOZ_DEBUG
861  JAVAC_FLAGS += -g  JAVAC_FLAGS += -g
862  endif  endif
863    
864    ifdef TIERS
865    DIRS += $(foreach tier,$(TIERS),$(tier_$(tier)_dirs))
866    STATIC_DIRS += $(foreach tier,$(TIERS),$(tier_$(tier)_staticdirs))
867    endif
Legend:
Removed from v.459  
changed lines
  Added in v.460
  ViewVC Help
Powered by ViewVC 1.1.24