/[jscoverage]/trunk/js/config/rules.mk

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

Parent Directory | Revision Log | View Patch Patch

-revision 459 by siliconforks,
Tue Dec  9 23:37:53 2008 UTC
+revision 460 by siliconforks,
Sat Sep 26 23:15:22 2009 UTC
 Line 38
  # the terms of any one of the MPL, the GPL or the LGPL.
  #
  # ***** END LICENSE BLOCK *****
- NO_DIST_INSTALL = 1
  ifndef topsrcdir
  topsrcdir               = $(DEPTH)
  endif
-Line 64
+Line 62
  EXEC                    = exec
  endif
+ # Don't copy xulrunner files at install time, when using system xulrunner
+ ifdef SYSTEM_LIBXUL
+   SKIP_COPY_XULRUNNER=1
+ endif
  # ELOG prints out failed command when building silently (gmake -s).
  ifneq (,$(findstring -s,$(MAKEFLAGS)))
    ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
-Line 115
+Line 118
  EXTRA_DSO_LIBS  := $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
  endif
+ ################################################################################
+ # Testing frameworks support
+ ################################################################################
+ ifdef ENABLE_TESTS
+ ifdef XPCSHELL_TESTS
+ ifndef MODULE
+ $(error Must define MODULE when defining XPCSHELL_TESTS.)
+ endif
+ testxpcobjdir = $(DEPTH)/_tests/xpcshell
+ # Test file installation
+ ifdef NSINSTALL_BIN
+ # nsinstall in moztools can't recursively copy directories, so use nsinstall.py
+ TEST_INSTALLER = $(PYTHON) $(topsrcdir)/config/nsinstall.py
+ else
+ TEST_INSTALLER = $(INSTALL)
+ endif
+ define _INSTALL_TESTS
+ $(TEST_INSTALLER) $(wildcard $(srcdir)/$(dir)/*) $(testxpcobjdir)/$(MODULE)/$(dir)
+ endef # do not remove the blank line!
+ SOLO_FILE ?= $(error Specify a test filename in SOLO_FILE when using check-interactive or check-one)
+ libs::
+         $(foreach dir,$(XPCSHELL_TESTS),$(_INSTALL_TESTS))
+         $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl \
+           $(testxpcobjdir)/all-test-dirs.list \
+           $(addprefix $(MODULE)/,$(XPCSHELL_TESTS))
+ testxpcsrcdir = $(topsrcdir)/testing/xpcshell
+ # Execute all tests in the $(XPCSHELL_TESTS) directories.
+ # See also testsuite-targets.mk 'xpcshell-tests' target for global execution.
+ xpcshell-tests:
+         $(PYTHON) -u \
+           $(testxpcsrcdir)/runxpcshelltests.py \
+           $(DIST)/bin/xpcshell \
+           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
+ # Execute a single test, specified in $(SOLO_FILE), but don't automatically
+ # start the test. Instead, present the xpcshell prompt so the user can
+ # attach a debugger and then start the test.
+ check-interactive:
+         $(PYTHON) -u \
+           $(testxpcsrcdir)/runxpcshelltests.py \
+           --test-path=$(SOLO_FILE) \
+           --interactive \
+           $(DIST)/bin/xpcshell \
+           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
+ # Execute a single test, specified in $(SOLO_FILE)
+ check-one:
+         $(PYTHON) -u \
+           $(testxpcsrcdir)/runxpcshelltests.py \
+           --test-path=$(SOLO_FILE) \
+           $(DIST)/bin/xpcshell \
+           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
+ endif # XPCSHELL_TESTS
+ ifdef CPP_UNIT_TESTS
+ # Compile the tests to $(DIST)/bin.  Make lots of niceties available by default
+ # through TestHarness.h, by modifying the list of includes and the libs against
+ # which stuff links.
+ CPPSRCS += $(CPP_UNIT_TESTS)
+ SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
+ REQUIRES += testing xpcom
+ LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
+ # ...and run them the usual way
+ check::
+         @$(EXIT_ON_ERROR) \
+           for f in $(subst .cpp,,$(CPP_UNIT_TESTS)); do \
+             XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) $(DIST)/bin/$$f; \
+           done
+ endif # CPP_UNIT_TESTS
+ .PHONY: check xpcshell-tests check-interactive check-one
+ endif # ENABLE_TESTS
  #
  # Library rules
  #
-Line 201
+Line 293
  ifndef GNU_CC
  #
- # All C++ files share a PDB file per directory. For parallel builds, this PDB
+ # Unless we're building SIMPLE_PROGRAMS, all C++ files share a PDB file per
- # file is shared and locked by MSPDBSRV.EXE, starting with MSVC8 SP1. If
+ # directory. For parallel builds, this PDB file is shared and locked by
- # you're using MSVC 7.1 or MSVC8 without SP1, don't do parallel builds.
+ # MSPDBSRV.EXE, starting with MSVC8 SP1. If you're using MSVC 7.1 or MSVC8
+ # without SP1, don't do parallel builds.
  #
  # The final PDB for libraries and programs is created by the linker and uses
  # a different name from the single PDB file created by the compiler. See
  # bug 462740.
  #
+ ifdef SIMPLE_PROGRAMS
+ COMPILE_PDBFILE = $(basename $(@F)).pdb
+ else
  COMPILE_PDBFILE = generated.pdb
+ endif
  LINK_PDBFILE = $(basename $(@F)).pdb
  ifdef MOZ_DEBUG
  CODFILE=$(basename $(@F)).cod
-Line 327
+Line 426
  # the Solaris WorkShop template repository cache.  it occasionally can get
  # out of sync, so targets like clobber should kill it.
  #
- ifeq ($(OS_ARCH),SunOS)
+ ifeq ($(SOLARIS_SUNPRO_CXX),1)
- ifeq ($(GNU_CXX),)
  GARBAGE_DIRS += SunWS_cache
  endif
- endif
  ifeq ($(OS_ARCH),OpenVMS)
  GARBAGE                 += $(wildcard *.*_defines)
-Line 362
+Line 459
  UPDATE_TITLE_tools = sed -e "s!Y!tools in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
  endif
+ ifneq (,$(strip $(DIRS)))
  LOOP_OVER_DIRS = \
      @$(EXIT_ON_ERROR) \
-     $(foreach dir,$(DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
+     $(foreach dir,$(DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; )
+ endif
  # we only use this for the makefiles target and other stuff that doesn't matter
+ ifneq (,$(strip $(PARALLEL_DIRS)))
  LOOP_OVER_PARALLEL_DIRS = \
      @$(EXIT_ON_ERROR) \
-     $(foreach dir,$(PARALLEL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
+     $(foreach dir,$(PARALLEL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; )
+ endif
+ ifneq (,$(strip $(STATIC_DIRS)))
  LOOP_OVER_STATIC_DIRS = \
      @$(EXIT_ON_ERROR) \
-     $(foreach dir,$(STATIC_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
+     $(foreach dir,$(STATIC_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; )
+ endif
+ ifneq (,$(strip $(TOOL_DIRS)))
  LOOP_OVER_TOOL_DIRS = \
      @$(EXIT_ON_ERROR) \
-     $(foreach dir,$(TOOL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
+     $(foreach dir,$(TOOL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; )
+ endif
  ifdef PARALLEL_DIRS
  # create a bunch of fake targets for order-only processing
-Line 606
+Line 711
  # default rule before including rules.mk
  ifndef SUPPRESS_DEFAULT_RULES
  ifdef TIERS
- DIRS += $(foreach tier,$(TIERS),$(tier_$(tier)_dirs))
- STATIC_DIRS += $(foreach tier,$(TIERS),$(tier_$(tier)_staticdirs))
  default all alldep::
          $(EXIT_ON_ERROR) \
          $(foreach tier,$(TIERS),$(MAKE) tier_$(tier); ) true
-Line 617
+Line 718
  else
  default all::
-         @$(EXIT_ON_ERROR) \
+ ifneq (,$(strip $(STATIC_DIRS)))
-         $(foreach dir,$(STATIC_DIRS),$(MAKE) -C $(dir); ) true
+         $(foreach dir,$(STATIC_DIRS),$(MAKE) -C $(dir); )
+ endif
          $(MAKE) export
          $(MAKE) libs
          $(MAKE) tools
-Line 720
+Line 822
  tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
          +$(LOOP_OVER_DIRS)
- ifdef TOOL_DIRS
+ ifneq (,$(strip $(TOOL_DIRS)))
          @$(EXIT_ON_ERROR) \
-         $(foreach dir,$(TOOL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) libs; ) true
+         $(foreach dir,$(TOOL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) libs; )
  endif
  #
-Line 749
+Line 851
  HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(HOST_LIBS))
  DSO_LDOPTS_DEPS = $(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))
+ # Dependancies which, if modified, should cause everything to rebuild
+ GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
  ##############################################
  ifdef PARALLEL_DIRS
  libs:: $(PARALLEL_DIRS_libs)
-Line 829
+Line 934
  # in both stages so you can do depend builds with PGO.
  ifdef SHARED_LIBRARY
  $(SHARED_LIBRARY): FORCE
- BINARY_BASENAME = $(SHARED_LIBRARY:$(DLL_SUFFIX)=)
  endif
  ifdef PROGRAM
  $(PROGRAM): FORCE
- BINARY_BASENAME = $(PROGRAM:$(BIN_SUFFIX)=)
  endif
  ifdef MOZ_PROFILE_USE
  # In the second pass, we need to merge the pgc files into the pgd file.
  # The compiler would do this for us automatically if they were in the right
  # place, but they're in dist/bin.
- ifdef BINARY_BASENAME
+ ifneq (,$(SHARED_LIBRARY)$(PROGRAM))
  export::
+ ifdef PROGRAM
+         $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
+           $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/bin
+ endif
+ ifdef SHARED_LIBRARY
          $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
-           $(BINARY_BASENAME) $(DIST)/bin
+           $(LIBRARY_NAME) $(DIST)/bin
+ endif
  endif
  endif # MOZ_PROFILE_USE
  endif # WINNT_
-Line 892
+Line 1001
  # PROGRAM = Foo
  # creates OBJS, links with LIBS to create Foo
  #
- $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) Makefile Makefile.in
+ $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
  ifeq (WINCE,$(OS_ARCH))
          $(LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
  else
-Line 930
+Line 1039
  endif
  endif # BeOS
- $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
+ $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
  ifeq (WINCE,$(OS_ARCH))
          $(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
  else
-Line 959
+Line 1068
  # SIMPLE_PROGRAMS = Foo Bar
  # creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
  #
- $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) Makefile Makefile.in
+ $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
  ifeq (WINCE,$(OS_ARCH))
          $(LD) -nologo  -entry:main -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
  else
-Line 987
+Line 1096
          $(MOZ_POST_PROGRAM_COMMAND) $@
  endif
- $(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
+ $(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
  ifeq (WINCE,$(OS_ARCH))
          $(HOST_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
  else
-Line 1053
+Line 1162
  EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
  endif
- $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in
+ $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
          rm -f $@
  ifneq (,$(GNU_LD)$(filter-out OS2 WINNT WINCE, $(OS_ARCH)))
  ifdef SHARED_LIBRARY_LIBS
-Line 1127
+Line 1236
  # symlinks back to the originals. The symlinks are a no-op for stabs debugging,
  # so no need to conditionalize on OS version or debugging format.
- $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) Makefile Makefile.in
+ $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
  ifndef INCREMENTAL_LINKER
          rm -f $@
  endif
-Line 1211
+Line 1320
  ifdef MOZ_AUTO_DEPS
  ifdef COMPILER_DEPEND
- ifeq (__SunOS,$(GNU_CC)_$(GNU_CXX)_$(OS_ARCH))
+ ifeq ($(SOLARIS_SUNPRO_CC),1)
  _MDDEPFILE = $(MDDEPDIR)/$(@F).pp
  define MAKE_DEPS_AUTO_CC
-Line 1254
+Line 1363
  endif
  # Rules for building native targets must come first because of the host_ prefix
- host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
- host_%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
- host_%.$(OBJ_SUFFIX): %.cc Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
- host_%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
- host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
- %: %.c Makefile Makefile.in
+ %: %.c $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          @$(MAKE_DEPS_AUTO_CC)
          $(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTOPTION)$@ $(_VPATH_SRCS)
- %.$(OBJ_SUFFIX): %.c Makefile Makefile.in
+ %.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          @$(MAKE_DEPS_AUTO_CC)
          $(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(_VPATH_SRCS)
- moc_%.cpp: %.h Makefile Makefile.in
+ moc_%.cpp: %.h $(GLOBAL_DEPS)
          $(MOC) $< $(OUTOPTION)$@
  ifdef ASFILES
  # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
  # a '-c' flag.
- %.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) Makefile Makefile.in
+ %.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) $(GLOBAL_DEPS)
          $(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
  endif
- %.$(OBJ_SUFFIX): %.S Makefile Makefile.in
+ %.$(OBJ_SUFFIX): %.S $(GLOBAL_DEPS)
          $(AS) -o $@ $(ASFLAGS) -c $<
- %: %.cpp Makefile Makefile.in
+ %: %.cpp $(GLOBAL_DEPS)
          @$(MAKE_DEPS_AUTO_CXX)
          $(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $(_VPATH_SRCS) $(LDFLAGS)
  #
  # Please keep the next two rules in sync.
  #
- %.$(OBJ_SUFFIX): %.cc Makefile Makefile.in
+ %.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          @$(MAKE_DEPS_AUTO_CXX)
          $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
- %.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
+ %.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          @$(MAKE_DEPS_AUTO_CXX)
  ifdef STRICT_CPLUSPLUS_SUFFIX
-Line 1320
+Line 1429
          $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
  endif #STRICT_CPLUSPLUS_SUFFIX
- $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
+ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          @$(MAKE_DEPS_AUTO_CXX)
          $(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $(_VPATH_SRCS)
- $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
+ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS)
          $(REPORT_BUILD)
          @$(MAKE_DEPS_AUTO_CC)
          $(ELOG) $(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $(_VPATH_SRCS)
-Line 1433
+Line 1542
  $(_JAVA_DIR)::
          $(NSINSTALL) -D $@
- $(_JAVA_DIR)/%.class: %.java Makefile Makefile.in $(_JAVA_DIR)
+ $(_JAVA_DIR)/%.class: %.java $(GLOBAL_DEPS) $(_JAVA_DIR)
          $(CYGWIN_WRAPPER) $(JAVAC) $(JAVAC_FLAGS) -classpath $(_JAVA_CLASSPATH) \
                          -sourcepath $(_JAVA_SOURCEPATH) -d $(_JAVA_DIR) $(_VPATH_SRCS)
- $(JAVA_LIBRARY): $(addprefix $(_JAVA_DIR)/,$(JAVA_SRCS:.java=.class)) Makefile Makefile.in
+ $(JAVA_LIBRARY): $(addprefix $(_JAVA_DIR)/,$(JAVA_SRCS:.java=.class)) $(GLOBAL_DEPS)
          $(JAR) cf $@ -C $(_JAVA_DIR) .
  GARBAGE_DIRS += $(_JAVA_DIR)
-Line 1476
+Line 1585
  # Copy each element of EXPORTS to $(PUBLIC)
  ifneq ($(EXPORTS)$(XPIDLSRCS)$(SDK_HEADERS)$(SDK_XPIDLSRCS),)
- $(SDK_PUBLIC) $(PUBLIC)::
+ $(SDK_PUBLIC) $(PUBLIC):
          $(NSINSTALL) -D $@
  endif
-Line 1603
+Line 1712
  # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
  ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
- $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS) $(SDK_XPIDLSRCS)) Makefile.in Makefile $(XPIDL_LINK)
+ $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS) $(SDK_XPIDLSRCS)) $(GLOBAL_DEPS) $(XPIDL_LINK)
          $(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS) $(SDK_XPIDLSRCS))
  endif # XPIDL_MODULE.xpt != XPIDLSRCS
-Line 1804
+Line 1913
  $(FINAL_TARGET)/chrome:
          $(NSINSTALL) -D $@
- # libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
+ ifneq (,$(wildcard $(JAR_MANIFEST)))
- # ifndef NO_DIST_INSTALL
+ ifndef NO_DIST_INSTALL
- #       @$(EXIT_ON_ERROR) \
+ libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
- #       if test -f $(JAR_MANIFEST); then \
+         $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
- #         $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
+           $(QUIET) -j $(FINAL_TARGET)/chrome \
- #           $(QUIET) -j $(FINAL_TARGET)/chrome \
+           $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
- #           $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
+           $(JAR_MANIFEST)
- #           $(JAR_MANIFEST); \
+ endif
- #       fi
+ endif
- # endif
  ifneq ($(DIST_FILES),)
- libs:: $(DIST_FILES)
+ $(DIST)/bin:
+         $(NSINSTALL) -D $@
+ libs:: $(DIST_FILES) $(DIST)/bin
          @$(EXIT_ON_ERROR) \
          for f in $(DIST_FILES); do \
            dest=$(FINAL_TARGET)/`basename $$f`; \
-Line 1903
+Line 2014
          $(_JAR_REGCHROME_DISABLE_JAR)
- ################################################################################
- # Testing frameworks support
- ################################################################################
- ifdef ENABLE_TESTS
- ifdef XPCSHELL_TESTS
- ifndef MODULE
- $(error Must define MODULE when defining XPCSHELL_TESTS.)
- endif
- # Test file installation
- libs::
-         @$(EXIT_ON_ERROR) \
-         for testdir in $(XPCSHELL_TESTS); do \
-           $(INSTALL) \
-             $(srcdir)/$$testdir/*.js \
-             $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
-         done
- # Path formats on Windows are hard.  We require a topsrcdir formatted so that
- # it may be passed to nsILocalFile.initWithPath (in other words, an absolute
- # path of the form X:\path\to\topsrcdir), which we store in NATIVE_TOPSRCDIR.
- # We require a forward-slashed path to topsrcdir so that it may be combined
- # with a relative forward-slashed path for loading scripts, both dynamically
- # and statically for head/test/tail JS files.  Of course, on non-Windows none
- # of this matters, and things will work correctly because everything's
- # forward-slashed, everywhere, always.
- ifdef CYGWIN_WRAPPER
- NATIVE_TOPSRCDIR   := `cygpath -wa $(topsrcdir)`
- FWDSLASH_TOPSRCDIR := `cygpath -ma $(topsrcdir)`
- else
- FWDSLASH_TOPSRCDIR := $(topsrcdir)
- ifeq ($(HOST_OS_ARCH),WINNT)
- NATIVE_TOPSRCDIR   := $(subst /,\\,$(WIN_TOP_SRC))
- else
- NATIVE_TOPSRCDIR   := $(topsrcdir)
- endif
- endif # CYGWIN_WRAPPER
- # Test execution
- check::
-         @$(EXIT_ON_ERROR) \
-         for testdir in $(XPCSHELL_TESTS); do \
-           $(RUN_TEST_PROGRAM) \
-             $(topsrcdir)/tools/test-harness/xpcshell-simple/test_all.sh \
-               $(DIST)/bin/xpcshell \
-               $(FWDSLASH_TOPSRCDIR) \
-               $(NATIVE_TOPSRCDIR) \
-               $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
-         done
- # Test execution
- check-interactive::
-         @$(EXIT_ON_ERROR) \
-         $(RUN_TEST_PROGRAM) \
-           $(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
-             $(DIST)/bin/xpcshell \
-             $(FWDSLASH_TOPSRCDIR) \
-             $(NATIVE_TOPSRCDIR) \
-             $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
-             $(SOLO_FILE) 1;
- # Test execution
- check-one::
-         @$(EXIT_ON_ERROR) \
-         $(RUN_TEST_PROGRAM) \
-           $(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
-             $(DIST)/bin/xpcshell \
-             $(FWDSLASH_TOPSRCDIR) \
-             $(NATIVE_TOPSRCDIR) \
-             $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
-             $(SOLO_FILE) 0;
- endif # XPCSHELL_TESTS
- endif # ENABLE_TESTS
  #############################################################################
  # Dependency system
  #############################################################################
-Line 2125
+Line 2157
  # Fake targets.  Always run these rules, even if a file/directory with that
  # name already exists.
  #
- .PHONY: all all_platforms alltags boot checkout chrome realchrome clean clobber clobber_all export install libs makefiles realclean run_viewer run_apprunner tools $(DIRS) $(TOOL_DIRS) FORCE check check-interactive check-one
+ .PHONY: all all_platforms alltags boot checkout chrome realchrome clean clobber clobber_all export install libs makefiles realclean run_viewer run_apprunner tools $(DIRS) $(TOOL_DIRS) FORCE
  # Used as a dependency to force targets to rebuild
  FORCE:
-Line 2144
+Line 2176
          +$(LOOP_OVER_DIRS)
  echo-variable-%:
-         @echo $($*)
+         @echo "$($*)"
  echo-tiers:
          @echo $(TIERS)
-Line 2263
+Line 2295
          @cd $(DEPTH)
          $(DOXYGEN) $(DEPTH)/config/doxygen.cfg
+ ifdef ENABLE_TESTS
  check:: $(SUBMAKEFILES) $(MAKE_DIRS)
          +$(LOOP_OVER_PARALLEL_DIRS)
          +$(LOOP_OVER_DIRS)
          +$(LOOP_OVER_TOOL_DIRS)
+ endif

 Legend:



Removed from v.459
 


changed lines


 
Added in v.460
 Legend:



Removed from v.459
 


changed lines


 
Added in v.460
-Removed from v.459
+Added in v.460

	ViewVC Help
Powered by ViewVC 1.1.24