bug 444686 - create/adapt build system for comm-central, mailnews changes, r=Standard8 r=Callek

This commit is contained in:
Robert Kaiser 2008-07-22 14:28:40 +02:00
Родитель 77157ac94b
Коммит 8928e44fa0
37 изменённых файлов: 110 добавлений и 66 удалений

44
directory/makefiles.sh Normal file
Просмотреть файл

@ -0,0 +1,44 @@
#! /bin/sh
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is the the Mozilla build system
#
# The Initial Developer of the Original Code is
# Ben Turner <mozilla@songbirdnest.com>
#
# Portions created by the Initial Developer are Copyright (C) 2007
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
add_makefiles "
directory/xpcom/Makefile
directory/xpcom/base/Makefile
directory/xpcom/base/public/Makefile
directory/xpcom/base/src/Makefile
"

Просмотреть файл

@ -93,7 +93,7 @@ endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

Просмотреть файл

@ -1,5 +1,5 @@
// Import the main scripts that mailnews tests need to set up and tear down
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailDirService.js");
// Import the required setup scripts.
do_import_script("mailnews/addrbook/test/resources/abSetup.js");
do_import_script("../mailnews/addrbook/test/resources/abSetup.js");

Просмотреть файл

@ -10,7 +10,7 @@
function run_test() {
// Test setup - copy the data file into place
var testAB = do_get_file("mailnews/addrbook/test/unit/data/cardForEmail.mab");
var testAB = do_get_file("../mailnews/addrbook/test/unit/data/cardForEmail.mab");
// Copy the file to the profile directory for a PAB
testAB.copyTo(gProfileDir, kPABData.fileName);

Просмотреть файл

@ -32,7 +32,7 @@ function checkLists(childNodes, number) {
function run_test() {
// Create a new card
// Test setup - copy the data file into place
var testAB = do_get_file("mailnews/addrbook/test/resources/abLists1.mab");
var testAB = do_get_file("../mailnews/addrbook/test/resources/abLists1.mab");
// Copy the file to the profile directory for a PAB
testAB.copyTo(gProfileDir, kPABData.fileName);

Просмотреть файл

@ -91,11 +91,11 @@ acObserver.prototype = {
function run_test() {
// Copy the data files into place
var testAB = do_get_file("mailnews/addrbook/test/unit/data/autocomplete.mab");
var testAB = do_get_file("../mailnews/addrbook/test/unit/data/autocomplete.mab");
testAB.copyTo(gProfileDir, kPABData.fileName);
testAB = do_get_file("mailnews/addrbook/test/unit/data/cardForEmail.mab");
testAB = do_get_file("../mailnews/addrbook/test/unit/data/cardForEmail.mab");
testAB.copyTo(gProfileDir, kCABData.fileName);

Просмотреть файл

@ -9,7 +9,7 @@
*/
// We import this to allow us to reuse the code of the results object.
do_import_script("mailnews/addrbook/src/nsAbAutoCompleteSearch.js");
do_import_script("../mailnews/addrbook/src/nsAbAutoCompleteSearch.js");
function createCard(chars, popularity) {
var card = Components.classes["@mozilla.org/addressbook/cardproperty;1"]

Просмотреть файл

@ -11,7 +11,7 @@
// collected books work correctly in an easy manner.
function run_test() {
// Test setup - copy the data file into place
var testAB = do_get_file("mailnews/addrbook/test/unit/data/cardForEmail.mab");
var testAB = do_get_file("../mailnews/addrbook/test/unit/data/cardForEmail.mab");
// Copy the file to the profile directory for a PAB
testAB.copyTo(gProfileDir, kPABData.fileName);

Просмотреть файл

@ -99,7 +99,7 @@ EXTRA_DSO_LIBS = msgbaseutil
endif
EXTRA_DSO_LDOPTS = \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \

Просмотреть файл

@ -1,3 +1,3 @@
// Import the main scripts that mailnews tests need to set up and tear down
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("mailnews/test/resources/mailTestUtils.js");
do_import_script("../mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailTestUtils.js");

Просмотреть файл

@ -123,7 +123,7 @@ var doTestingListener =
function getSpec(aFileName)
{
var file = do_get_file("mailnews/extensions/bayesian-spam-filter/test/resources/" + aFileName);
var file = do_get_file("../mailnews/extensions/bayesian-spam-filter/test/resources/" + aFileName);
var uri = nsIIOService.newFileURI(file).QueryInterface(Ci.nsIURL);
uri.query = "type=application/x-message-display";
return uri.spec;

Просмотреть файл

@ -42,7 +42,7 @@ const tagService = Cc["@mozilla.org/messenger/tagservice;1"]
.getService(Ci.nsIMsgTagService);
const dbviewContractId = "@mozilla.org/messenger/msgdbview;1?type=" + "quicksearch";
const dbView = Cc[dbviewContractId].createInstance(Ci.nsIMsgDBView);
const bugmail1 = do_get_file("mailnews/test/data/bugmail1");
const bugmail1 = do_get_file("../mailnews/test/data/bugmail1");
// I'm only loading msgDBService to help load symbols for debugging
//const msgDBService = Cc["@mozilla.org/msgDatabase/msgDBService;1"]
// .getService(Ci.nsIMsgDBService);

Просмотреть файл

@ -18,7 +18,7 @@
* - Deleting messages and folders, to trash and from trash (permanently)
*/
do_import_script("mailnews/base/test/resources/msgFolderListenerSetup.js");
do_import_script("../mailnews/base/test/resources/msgFolderListenerSetup.js");
// Globals
var gMsgFile1, gMsgFile2, gMsgFile3;
@ -190,9 +190,9 @@ function run_test()
loadLocalMailAccount();
// Load up some messages so that we can copy them in later.
gMsgFile1 = do_get_file("mailnews/test/data/bugmail10");
gMsgFile2 = do_get_file("mailnews/test/data/bugmail11");
gMsgFile3 = do_get_file("mailnews/test/data/draft1");
gMsgFile1 = do_get_file("../mailnews/test/data/bugmail10");
gMsgFile2 = do_get_file("../mailnews/test/data/bugmail11");
gMsgFile3 = do_get_file("../mailnews/test/data/draft1");
// Create another folder to move and copy messages around, and force initialization.
var rootFolder = gLocalIncomingServer.rootMsgFolder;

Просмотреть файл

@ -36,10 +36,10 @@
// Testing of to, cc, toorcc in addressbook search features added in bug 187768
do_import_script("mailnews/test/resources/searchTestUtils.js");
do_import_script("../mailnews/test/resources/searchTestUtils.js");
// add address book setup
do_import_script("mailnews/addrbook/test/resources/abSetup.js");
do_import_script("../mailnews/addrbook/test/resources/abSetup.js");
const ABUri = kPABData.URI;
@ -120,12 +120,12 @@ var Tests =
var Files =
[
"mailnews/test/data/bugmail2",
"mailnews/test/data/bugmail3",
"mailnews/test/data/bugmail4",
"mailnews/test/data/bugmail5",
"mailnews/test/data/bugmail6",
"mailnews/test/data/bugmail7"
"../mailnews/test/data/bugmail2",
"../mailnews/test/data/bugmail3",
"../mailnews/test/data/bugmail4",
"../mailnews/test/data/bugmail5",
"../mailnews/test/data/bugmail6",
"../mailnews/test/data/bugmail7"
]
var messageKey, hdr;
@ -137,7 +137,7 @@ function run_test()
loadLocalMailAccount();
// Test setup - copy the data file into place
var testAB = do_get_file("mailnews/addrbook/test/unit/data/cardForEmail.mab");
var testAB = do_get_file("../mailnews/addrbook/test/unit/data/cardForEmail.mab");
// Copy the file to the profile directory for a PAB
testAB.copyTo(gProfileDir, kPABData.fileName);

Просмотреть файл

@ -36,7 +36,7 @@
// Testing of search by junk percent and junk score origin
do_import_script("mailnews/test/resources/searchTestUtils.js");
do_import_script("../mailnews/test/resources/searchTestUtils.js");
const copyService = Cc["@mozilla.org/messenger/messagecopyservice;1"]
.getService(Ci.nsIMsgCopyService);
@ -55,7 +55,7 @@ const offlineMail = nsMsgSearchScope.offlineMail;
const JunkScoreOrigin = nsMsgSearchAttrib.JunkScoreOrigin;
const JunkPercent = nsMsgSearchAttrib.JunkPercent;
const fileName = "mailnews/test/data/bugmail1";
const fileName = "../mailnews/test/data/bugmail1";
/*
* The search for junkpercent is defined as the effective value,

Просмотреть файл

@ -41,7 +41,7 @@
* Does not do comprehensive testing.
*
*/
do_import_script("mailnews/test/resources/searchTestUtils.js");
do_import_script("../mailnews/test/resources/searchTestUtils.js");
const tagService = Cc["@mozilla.org/messenger/tagservice;1"]
.getService(Ci.nsIMsgTagService);
@ -341,7 +341,7 @@ function run_test()
};
// Get a message into the local filestore. function testKeywordSearch() continues the testing after the copy.
var bugmail1 = do_get_file("mailnews/test/data/bugmail1");
var bugmail1 = do_get_file("../mailnews/test/data/bugmail1");
do_test_pending();
copyService.CopyFileMessage(bugmail1, gLocalInboxFolder, null, false, 0,
copyListener, null);

Просмотреть файл

@ -122,7 +122,7 @@ ifndef MOZ_STATIC_MAIL_BUILD
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)

Просмотреть файл

@ -126,8 +126,8 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_JS_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

Просмотреть файл

@ -102,7 +102,7 @@ EXTRA_DSO_LDOPTS = \
ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
SHARED_LIBRARY_LIBS += \
$(DEPTH)/xpcom/MoreFiles/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
$(MOZDEPTH)/xpcom/MoreFiles/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
endif
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,10 +1,10 @@
// Import the main scripts that mailnews tests need to set up and tear down
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("mailnews/test/resources/mailTestUtils.js");
do_import_script("../mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailTestUtils.js");
// Import the smtp server scripts
do_import_script("mailnews/test/fakeserver/maild.js")
do_import_script("mailnews/test/fakeserver/smtpd.js")
do_import_script("../mailnews/test/fakeserver/maild.js")
do_import_script("../mailnews/test/fakeserver/smtpd.js")
const SMTP_PORT = 1024+120;

Просмотреть файл

@ -4,7 +4,7 @@
*/
// We need the address book details for this test
do_import_script("mailnews/addrbook/test/resources/abSetup.js");
do_import_script("../mailnews/addrbook/test/resources/abSetup.js");
const MsgComposeContractID = "@mozilla.org/messengercompose/compose;1";
const MsgComposeParamsContractID = "@mozilla.org/messengercompose/composeparams;1";
@ -46,12 +46,12 @@ function checkPopulate(aTo, aNonHTMLRecipients, aPreferMailOut, aCheckTo)
function run_test() {
// Test setup - copy the data files into place
var testAB = do_get_file("mailnews/addrbook/test/resources/abLists1.mab");
var testAB = do_get_file("../mailnews/addrbook/test/resources/abLists1.mab");
// Copy the file to the profile directory for a PAB
testAB.copyTo(gProfileDir, kPABData.fileName);
testAB = do_get_file("mailnews/addrbook/test/resources/abLists2.mab");
testAB = do_get_file("../mailnews/addrbook/test/resources/abLists2.mab");
// Copy the file to the profile directory for a CAB
testAB.copyTo(gProfileDir, kCABData.fileName);

Просмотреть файл

@ -17,7 +17,7 @@ function test_RFC2822() {
type = "RFC 2822";
// Test file
var testFile = do_get_file("mailnews/compose/test/unit/data/message1.eml");
var testFile = do_get_file("../mailnews/compose/test/unit/data/message1.eml");
// Ensure we have at least one mail account
loadLocalMailAccount();

Просмотреть файл

@ -1,2 +1,2 @@
// Import the main scripts that mailnews tests need to set up and tear down
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailDirService.js");

Просмотреть файл

@ -3,7 +3,7 @@
* Test suite for msg database functions.
*/
do_import_script("mailnews/test/resources/mailTestUtils.js");
do_import_script("../mailnews/test/resources/mailTestUtils.js");
function run_test() {
loadLocalMailAccount();

Просмотреть файл

@ -1,3 +1,3 @@
// Import the main scripts that mailnews tests need to set up and tear down
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("mailnews/test/resources/mailTestUtils.js");
do_import_script("../mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailTestUtils.js");

Просмотреть файл

@ -38,7 +38,7 @@
// main setup
do_import_script("mailnews/extensions/bayesian-spam-filter/test/resources/trainingfile.js");
do_import_script("../mailnews/extensions/bayesian-spam-filter/test/resources/trainingfile.js");
const nsIPrefBranch = Cc["@mozilla.org/preferences-service;1"]
.getService(Ci.nsIPrefBranch);
@ -152,7 +152,7 @@ function checkToken(aToken, aGoodCount, aJunkCount)
function getSpec(aFileName)
{
var file = do_get_file("mailnews/extensions/bayesian-spam-filter/test/resources/" + aFileName);
var file = do_get_file("../mailnews/extensions/bayesian-spam-filter/test/resources/" + aFileName);
var uri = nsIIOService.newFileURI(file).QueryInterface(Ci.nsIURL);
uri.query = "type=application/x-message-display";
return uri.spec;

Просмотреть файл

@ -85,7 +85,7 @@ SHARED_LIBRARY_LIBS = \
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

Просмотреть файл

@ -75,7 +75,7 @@ include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/xpcom/tests \
-I$(MOZILLA_SRCDIR)/xpcom/tests \
-I$(topsrcdir)/mailnews/base/util \
-I$(srcdir)/../src \
$(NULL)

Просмотреть файл

@ -130,7 +130,7 @@ EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)

Просмотреть файл

@ -1,4 +1,4 @@
// Set up the profile directory for verifying the success of imports
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailDirService.js");
// Import the script with basic import functions
do_import_script("mailnews/import/test/resources/import_helper.js");
do_import_script("../mailnews/import/test/resources/import_helper.js");

Просмотреть файл

@ -4,7 +4,7 @@
*/
function run_test()
{
var file = do_get_file("mailnews/import/test/resources/basic_addressbook.csv");
var file = do_get_file("../mailnews/import/test/resources/basic_addressbook.csv");
var errorStr = Cc["@mozilla.org/supports-string;1"]
.createInstance(Ci.nsISupportsString);
// get the text Address Book import interface and make sure it succeeded

Просмотреть файл

@ -84,7 +84,7 @@ SHARED_LIBRARY_LIBS = \
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

Просмотреть файл

@ -1,10 +1,10 @@
// Import the main scripts that mailnews tests need to set up and tear down
do_import_script("mailnews/test/resources/mailDirService.js");
do_import_script("mailnews/test/resources/mailTestUtils.js");
do_import_script("../mailnews/test/resources/mailDirService.js");
do_import_script("../mailnews/test/resources/mailTestUtils.js");
// Import the pop3 server scripts
do_import_script("mailnews/test/fakeserver/maild.js")
do_import_script("mailnews/test/fakeserver/pop3d.js")
do_import_script("../mailnews/test/fakeserver/maild.js")
do_import_script("../mailnews/test/fakeserver/pop3d.js")
const POP3_PORT = 1024+110;

Просмотреть файл

@ -87,7 +87,7 @@ endif
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \

Просмотреть файл

@ -1,9 +1,9 @@
// Import the servers
do_import_script("mailnews/test/fakeserver/maild.js")
do_import_script("mailnews/test/fakeserver/nntpd.js")
do_import_script("../mailnews/test/fakeserver/maild.js")
do_import_script("../mailnews/test/fakeserver/nntpd.js")
// Generic mailnews resource scripts
do_import_script("mailnews/test/resources/mailDirService.js")
do_import_script("../mailnews/test/resources/mailDirService.js")
// The groups to set up on the fake server.
// It is an array of tuples, where the first element is the group name and the

Просмотреть файл

@ -101,7 +101,7 @@ function testRFC977() {
// Test - posting
test = "news with post";
server.resetTest();
var url = create_post(prefix, "mailnews/news/test/postings/post1.eml");
var url = create_post(prefix, "../mailnews/news/test/postings/post1.eml");
setupProtocolTest(NNTP_PORT, url);
server.performTest();
transaction = server.playTransaction();

Просмотреть файл

@ -2,7 +2,7 @@
// This file implements test POP3 servers
function readFile(fileName) {
var file = do_get_file("mailnews/local/test/unit/data/" + fileName);
var file = do_get_file("../mailnews/local/test/unit/data/" + fileName);
// If these fail, there is a problem with the test
do_check_neq(file, null);