| 1 |
polynomial-c 11/10/02 20:49:39 |
| 2 |
|
| 3 |
Added: Copy_xpcshell_only_if_tests_are_enabled.patch |
| 4 |
Log: |
| 5 |
Revision bump to make use of new patchset. Removed old |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/seamonkey/files/Copy_xpcshell_only_if_tests_are_enabled.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/files/Copy_xpcshell_only_if_tests_are_enabled.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/files/Copy_xpcshell_only_if_tests_are_enabled.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: Copy_xpcshell_only_if_tests_are_enabled.patch |
| 16 |
=================================================================== |
| 17 |
# HG changeset patch |
| 18 |
# User Takanori MATSUURA <t.matsuu@×××××.com> |
| 19 |
# Date 1311059208 -32400 |
| 20 |
# Node ID 6d8318b1709e2259c1077ba1f80374bfc45af9ba |
| 21 |
# Parent 6596041bb85c5106dc474767bc481c6522f926f3 |
| 22 |
Bug 672286 - Copy xpcshell.ini only if ENABLE_TESTS is set; r=Standard8 |
| 23 |
|
| 24 |
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in |
| 25 |
--- a/mail/app/Makefile.in |
| 26 |
+++ b/mail/app/Makefile.in |
| 27 |
@@ -252,24 +252,27 @@ LIBS += -lphexlib |
| 28 |
endif |
| 29 |
|
| 30 |
libs:: $(srcdir)/profile/prefs.js |
| 31 |
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile |
| 32 |
|
| 33 |
libs:: blocklist.xml |
| 34 |
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin |
| 35 |
|
| 36 |
+ifdef ENABLE_TESTS |
| 37 |
# XXX This is a hack to ensure that we get the right xpcshell.ini for our tests |
| 38 |
# and that we can share the core mozilla-central xpcshell.ini. |
| 39 |
# mozilla-central does this in testing/xpcshell-tests which means that it is |
| 40 |
# very hard for anyone to specify anything else. |
| 41 |
libs:: |
| 42 |
+ $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell |
| 43 |
cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/xpcshell-core.ini |
| 44 |
$(INSTALL) $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell |
| 45 |
cp $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list |
| 46 |
+endif |
| 47 |
|
| 48 |
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
| 49 |
|
| 50 |
AB := $(firstword $(subst -, ,$(AB_CD))) |
| 51 |
|
| 52 |
APP_NAME = $(MOZ_APP_DISPLAYNAME) |
| 53 |
|
| 54 |
LOWER_APP_NAME = $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]') |
| 55 |
diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in |
| 56 |
--- a/suite/app/Makefile.in |
| 57 |
+++ b/suite/app/Makefile.in |
| 58 |
@@ -216,24 +216,27 @@ ifeq ($(OS_ARCH),WINNT) |
| 59 |
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt |
| 60 |
else |
| 61 |
$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/ |
| 62 |
endif |
| 63 |
|
| 64 |
libs:: blocklist.xml |
| 65 |
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin |
| 66 |
|
| 67 |
+ifdef ENABLE_TESTS |
| 68 |
# XXX This is a hack to ensure that we get the right xpcshell.ini for our tests |
| 69 |
# and that we can share the core mozilla-central xpcshell.ini. |
| 70 |
# mozilla-central does this in testing/xpcshell-tests which means that it is |
| 71 |
# very hard for anyone to specify anything else. |
| 72 |
libs:: |
| 73 |
+ $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell |
| 74 |
cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/xpcshell-core.ini |
| 75 |
$(INSTALL) $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell |
| 76 |
cp $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list |
| 77 |
+endif |
| 78 |
|
| 79 |
ifdef MOZ_OMNIJAR |
| 80 |
# Make extensions end up as XPIs instead of flat chrome when doing omni.jar. |
| 81 |
# APP_EXTENSIONS exist only bundled with the application, |
| 82 |
# PROFILE_EXTENSIONS will be copied to the profile in installed builds. |
| 83 |
# NOTE: This is a hack to run this at the end of compilation, would be nicer |
| 84 |
# if this was done right away for built-in extensions in omnijar mode. |
| 85 |
# Listed extension GUIDs: |
Archives