/[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 506 by siliconforks, Sat Sep 26 23:15:22 2009 UTC revision 507 by siliconforks, Sun Jan 10 07:23:34 2010 UTC
# Line 73  Line 73 
73   SHORT_LIBNAME \   SHORT_LIBNAME \
74   XPI_PKGNAME \   XPI_PKGNAME \
75   INSTALL_EXTENSION_ID \   INSTALL_EXTENSION_ID \
76     SHARED_LIBRARY_NAME \
77     STATIC_LIBRARY_NAME \
78   $(NULL)   $(NULL)
79    
80  # checks for internal spaces or trailing spaces in the variable  # checks for internal spaces or trailing spaces in the variable
# Line 81  Line 83 
83    
84  $(foreach x,$(CHECK_VARS),$(check-variable))  $(foreach x,$(CHECK_VARS),$(check-variable))
85    
86    core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
87    
88  # FINAL_TARGET specifies the location into which we copy end-user-shipped  # FINAL_TARGET specifies the location into which we copy end-user-shipped
89  # build products (typelibs, components, chrome).  # build products (typelibs, components, chrome).
90  #  #
# Line 98  Line 102 
102  MAKE_JARS_TARGET = $(FINAL_TARGET)  MAKE_JARS_TARGET = $(FINAL_TARGET)
103  endif  endif
104    
 #  
105  # The VERSION_NUMBER is suffixed onto the end of the DLLs we ship.  # The VERSION_NUMBER is suffixed onto the end of the DLLs we ship.
 # Since the longest of these is 5 characters without the suffix,  
 # be sure to not set VERSION_NUMBER to anything longer than 3  
 # characters for Win16's sake.  
 #  
106  VERSION_NUMBER          = 50  VERSION_NUMBER          = 50
107    
108  ifeq ($(HOST_OS_ARCH),WINNT)  ifeq ($(HOST_OS_ARCH),WINNT)
# Line 154  Line 153 
153  MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)  MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
154    
155  ifdef MOZ_MEMORY  ifdef MOZ_MEMORY
156  ifneq ($(OS_ARCH),WINNT)  ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
157  JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)  JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
158  endif  endif
159  endif  endif
# Line 241  Line 240 
240  OS_CXXFLAGS += $(_DEBUG_CFLAGS)  OS_CXXFLAGS += $(_DEBUG_CFLAGS)
241  OS_LDFLAGS += $(_DEBUG_LDFLAGS)  OS_LDFLAGS += $(_DEBUG_LDFLAGS)
242    
243  # MOZ_PROFILE equivs for win32  # XXX: What does this? Bug 482434 filed for better explanation.
244  ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)  ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
245  ifdef MOZ_DEBUG  ifdef MOZ_DEBUG
246  ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))  ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
# Line 250  Line 249 
249  endif  endif
250  else # ! MOZ_DEBUG  else # ! MOZ_DEBUG
251    
252    # We don't build a static CRT when building a custom CRT,
253    # it appears to be broken. So don't link to jemalloc if
254    # the Makefile wants static CRT linking.
255    ifeq ($(MOZ_MEMORY)_$(USE_STATIC_LIBS),1_)
256    # Disable default CRT libs and add the right lib path for the linker
257    OS_LDFLAGS += $(MOZ_MEMORY_LDFLAGS)
258    endif
259    
260  # MOZ_DEBUG_SYMBOLS generates debug symbols in separate PDB files.  # MOZ_DEBUG_SYMBOLS generates debug symbols in separate PDB files.
261  # Used for generating an optimized build with debugging symbols.  # Used for generating an optimized build with debugging symbols.
262  # Used in the Windows nightlies to generate symbols for crash reporting.  # Used in the Windows nightlies to generate symbols for crash reporting.
# Line 359  Line 366 
366  endif  endif
367  endif  endif
368    
369    ifndef SHARED_LIBRARY_NAME
370    ifdef LIBRARY_NAME
371    SHARED_LIBRARY_NAME=$(LIBRARY_NAME)
372    endif
373    endif
374    
375    ifndef STATIC_LIBRARY_NAME
376    ifdef LIBRARY_NAME
377    STATIC_LIBRARY_NAME=$(LIBRARY_NAME)
378    endif
379    endif
380    
381  # This comes from configure  # This comes from configure
382  ifdef MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE  ifdef MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE
383  NO_PROFILE_GUIDED_OPTIMIZE = 1  NO_PROFILE_GUIDED_OPTIMIZE = 1
# Line 482  Line 501 
501  JAVA_DIST_DIR = $(DEPTH)/$(JAVA_GEN_DIR)  JAVA_DIST_DIR = $(DEPTH)/$(JAVA_GEN_DIR)
502  JAVA_IFACES_PKG_NAME = org/mozilla/interfaces  JAVA_IFACES_PKG_NAME = org/mozilla/interfaces
503    
504  REQ_INCLUDES    = -I$(srcdir) -I. $(foreach d,$(REQUIRES),-I$(DIST)/include/$d) -I$(DIST)/include  INCLUDES = \
505  ifdef LIBXUL_SDK    $(LOCAL_INCLUDES) \
506  REQ_INCLUDES_SDK = $(foreach d,$(REQUIRES),-I$(LIBXUL_SDK)/include/$d) -I$(LIBXUL_SDK)/include    -I$(srcdir) \
507  endif    -I. \
508      -I$(DIST)/include -I$(DIST)/include/nsprpub \
509  INCLUDES        = $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)    $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
510      $(OS_INCLUDES) \
511  ifndef MOZILLA_INTERNAL_API    $(NULL)
 INCLUDES        += -I$(LIBXUL_DIST)/sdk/include  
 endif  
512    
513  include $(topsrcdir)/config/static-checking-config.mk  include $(topsrcdir)/config/static-checking-config.mk
514    
515    ifdef MOZ_SHARK
516    OS_CFLAGS += -F/System/Library/PrivateFrameworks
517    OS_CXXFLAGS += -F/System/Library/PrivateFrameworks
518    OS_LDFLAGS += -F/System/Library/PrivateFrameworks -framework CHUD
519    endif # ifdef MOZ_SHARK
520    
521  CFLAGS          = $(OS_CFLAGS)  CFLAGS          = $(OS_CFLAGS)
522  CXXFLAGS        = $(OS_CXXFLAGS)  CXXFLAGS        = $(OS_CXXFLAGS)
523  LDFLAGS         = $(OS_LDFLAGS) $(MOZ_FIX_LINK_PATHS)  LDFLAGS         = $(OS_LDFLAGS) $(MOZ_FIX_LINK_PATHS)
# Line 596  Line 619 
619    
620  # Default location of include files  # Default location of include files
621  IDL_DIR         = $(DIST)/idl  IDL_DIR         = $(DIST)/idl
 ifdef MODULE  
 PUBLIC          = $(DIST)/include/$(MODULE)  
 else  
 PUBLIC          = $(DIST)/include  
 endif  
622    
623  XPIDL_FLAGS = -I$(srcdir) -I$(IDL_DIR)  XPIDL_FLAGS = -I$(srcdir) -I$(IDL_DIR)
624  ifdef LIBXUL_SDK  ifdef LIBXUL_SDK
625  XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl  XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
626  endif  endif
627    
 SDK_PUBLIC  = $(DIST)/sdk/include  
 SDK_IDL_DIR = $(DIST)/sdk/idl  
628  SDK_LIB_DIR = $(DIST)/sdk/lib  SDK_LIB_DIR = $(DIST)/sdk/lib
629  SDK_BIN_DIR = $(DIST)/sdk/bin  SDK_BIN_DIR = $(DIST)/sdk/bin
630    
# Line 758  Line 774 
774  ifndef NSDISTMODE  ifndef NSDISTMODE
775  NSDISTMODE=absolute_symlink  NSDISTMODE=absolute_symlink
776  endif  endif
777  PWD := $(shell pwd)  PWD := $(CURDIR)
778  endif  endif
779    
780  ifdef NSINSTALL_BIN  ifdef NSINSTALL_BIN
781  NSINSTALL       = $(CYGWIN_WRAPPER) $(NSINSTALL_BIN)  NSINSTALL       = $(CYGWIN_WRAPPER) $(NSINSTALL_BIN)
782  else  else
 ifeq (WINNT,$(CROSS_COMPILE)$(OS_ARCH))  
 NSINSTALL       = $(CYGWIN_WRAPPER) $(MOZ_TOOLS_DIR)/bin/nsinstall  
 else  
783  ifeq (OS2,$(CROSS_COMPILE)$(OS_ARCH))  ifeq (OS2,$(CROSS_COMPILE)$(OS_ARCH))
784  NSINSTALL       = $(MOZ_TOOLS_DIR)/nsinstall  NSINSTALL       = $(MOZ_TOOLS_DIR)/nsinstall
785  else  else
786  NSINSTALL       = $(CONFIG_TOOLS)/nsinstall  NSINSTALL       = $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
787  endif # OS2  endif # OS2
 endif # WINNT  
788  endif # NSINSTALL_BIN  endif # NSINSTALL_BIN
789    
790    
# Line 797  Line 809 
809  endif # copy  endif # copy
810  endif # WINNT/OS2  endif # WINNT/OS2
811    
 ifeq (,$(filter-out WINCE,$(OS_ARCH)))  
 NSINSTALL       = $(CYGWIN_WRAPPER) nsinstall  
 INSTALL     = $(CYGWIN_WRAPPER) nsinstall  
 endif  
   
812  # Use nsinstall in copy mode to install files on the system  # Use nsinstall in copy mode to install files on the system
813  SYSINSTALL      = $(NSINSTALL) -t  SYSINSTALL      = $(NSINSTALL) -t
814    

Legend:
Removed from v.506  
changed lines
  Added in v.507

  ViewVC Help
Powered by ViewVC 1.1.24