summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-01-31 16:15:39 +0100
committerFabien Tassin <fta@sofaraway.org>2008-01-31 16:15:39 +0100
commitd86b223953fa5c006a7658531625f3c6e5561f7f (patch)
tree5e7ddcbe1669f516ec8d16a1ff9300056b2b59ab /src
parent773040a50388ad0fe682e93dbcad9881a5cf8b56 (diff)
* Add support in mozclient for DEBIAN_TAG for nss and nspr by not using
mozilla/client.mk for those two. - update src/mozclient.mk.in and README - update src/{nspr,nss}.mk.in - drop src/patches/{nspr,nss}_target.patch - update src/patches/xulbrowser_target.patch - update src/patches/series
Diffstat (limited to 'src')
-rw-r--r--src/mozclient.mk.in40
-rw-r--r--src/nspr.mk.in3
-rw-r--r--src/nss.mk.in3
-rw-r--r--src/patches/nspr_target.patch84
-rw-r--r--src/patches/nss_target.patch92
-rw-r--r--src/patches/series2
-rw-r--r--src/patches/xulbrowser_target.patch22
7 files changed, 47 insertions, 199 deletions
diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in
index 3453834..459bee7 100644
--- a/src/mozclient.mk.in
+++ b/src/mozclient.mk.in
@@ -39,7 +39,9 @@
# project.mk contains the following parameters
# - MOZCLIENT_TARGET (mandatory): a label, usually 'project-orig'
# - MOZCLIENT_APPNAME (mandatory): package name
-# - MOZCLIENT_PROJECT (mandatory): CVS project name
+# - MOZCLIENT_MODULES (optional): list of modules/directories for direct checkout
+# - MOZCLIENT_PROJECT (mandatory): CVS project name. If $(NULL), then
+#  $(MOZCLIENT_MODULES) becomes mandatory
# - MOZCLIENT_BRANCH (optional): CVS branch name
# - MOZCLIENT_FILE (mandatory): source file containing the version
# - MOZCLIENT_GETVERSION (mandatory): how to transform the version
@@ -110,15 +112,17 @@ mozclient-deps:
@if [ ! -f /usr/bin/quilt ] ; then echo "**ERROR** Depends on missing quilt. Abort"; exit 1; fi
@if [ ! -f /usr/bin/wget ] ; then echo "**ERROR** Depends on missing wget. Abort"; exit 1; fi
+mozclient-dir:
+ rm -rf $(MOZCLIENT_TMP)
+ mkdir $(MOZCLIENT_TMP)
+
# Get the client
ifneq (,$(MOZCLIENT_BRANCH))
$(MOZ_CLIENT): MOZCLIENT_TBRANCH = -r $(MOZCLIENT_BRANCH)
else
$(MOZ_CLIENT): MOZCLIENT_TBRANCH = $(NULL)
endif
-$(MOZ_CLIENT): mozclient-deps
- rm -rf $(MOZCLIENT_TMP)
- mkdir $(MOZCLIENT_TMP)
+$(MOZ_CLIENT): mozclient-deps mozclient-dir
cd $(MOZCLIENT_TMP) && cvs -d $(MOZCLIENT_CVS_LOC) co $(MOZCLIENT_TBRANCH) $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $@
mozclient-client: $(MOZCLIENT_TMP)/$(MOZCLIENT_STAMP)
@@ -150,6 +154,9 @@ mozclient-clean:
rm -rf $(MOZCLIENT_TMP)
# Checkout using either a TAG, a date or nothing (last commit date)
+# Use mozclient.mk if $(MOZCLIENT_PROJECT) is specified, otherwise, do a direct cvs checkout
+# using $(MOZCLIENT_MODULES)
+ifneq (,$(MOZCLIENT_PROJECT))
ifneq (,$(DEBIAN_TAG))
mozclient-checkout: MOZCLIENT_DATE = $(NULL)
else
@@ -157,14 +164,27 @@ ifneq (,$(DEBIAN_DATE))
mozclient-checkout: MOZCLIENT_DATE = MOZ_CO_DATE="$(DEBIAN_DATE)"
else
mozclient-checkout: DEBIAN_DATE = $(shell $(MOZCLIENT_GETDATE))
-mozclient-checkout: MOZCLIENT_DATE = MOZ_CO_DATE="$(shell echo $(DEBIAN_DATE) | $(DATE_FILTER))"
+mozclient-checkout: MOZCLIENT_DATE = MOZ_CO_DATE="$(shell echo $(DEBIAN_DATE) | $(DATE_FILTER))"
endif
endif
mozclient-checkout:
- @echo DEBIAN_DATE=$(DEBIAN_DATE)
cd $(MOZCLIENT_TMP) && make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=$(MOZCLIENT_PROJECT) $(MOZCLIENT_DATE) $(DEBIAN_MOZ_CO_TAG)
- @echo DEBIAN_DATE=$(DEBIAN_DATE)
echo $(DEBIAN_DATE) > $(MOZCLIENT_TMP)/.date
+else
+ifneq (,$(DEBIAN_TAG))
+mozclient-checkout: MOZCLIENT_DATE = $(NULL)
+else
+ifneq (,$(DEBIAN_DATE))
+mozclient-checkout: MOZCLIENT_DATE = -D "$(DEBIAN_DATE)"
+else
+mozclient-checkout: DEBIAN_DATE = $(shell $(MOZCLIENT_GETDATE))
+mozclient-checkout: MOZCLIENT_DATE = -D "$(shell echo $(DEBIAN_DATE) | $(DATE_FILTER))"
+endif
+endif
+mozclient-checkout:
+ cd $(MOZCLIENT_TMP) && cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot -q -z 3 co -P -A $(MOZCLIENT_DATE) $(MOZCLIENT_MODULES)
+ echo $(DEBIAN_DATE) > $(MOZCLIENT_TMP)/.date
+endif
# Remove bin-only files using the remove.binonly.sh script.
# Keep a log in REMOVED+nobinonly.txt
@@ -198,8 +218,12 @@ endif
-ls -l $(MOZCLIENT_APPNAME)_$(MOZCLIENT_VERSION).orig.tar.gz
# The real target
+ifneq (,$(MOZCLIENT_PROJECT))
$(MOZCLIENT_TARGET): $(MOZ_CLIENT) $(MOZCLIENT_TMP)/$(MOZCLIENT_STAMP) mozclient-checkout mozclient-remove-bin mozclient-pack
+else
+$(MOZCLIENT_TARGET): mozclient-deps mozclient-dir mozclient-checkout mozclient-remove-bin mozclient-pack
+endif
get-orig-source: $(MOZCLIENT_TARGET)
-.PHONY: mozclient-patch mozclient-unpatch mozclient-checkout mozclient-remove-bin mozclient-pack $(MOZCLIENT_TARGET) get-orig-source
+.PHONY: mozclient-deps mozclient-dir mozclient-patch mozclient-unpatch mozclient-checkout mozclient-remove-bin mozclient-pack $(MOZCLIENT_TARGET) get-orig-source
diff --git a/src/nspr.mk.in b/src/nspr.mk.in
index 70725fe..01a1f46 100644
--- a/src/nspr.mk.in
+++ b/src/nspr.mk.in
@@ -19,7 +19,8 @@
MOZCLIENT_TARGET := nspr-orig
MOZCLIENT_APPNAME := nspr
-MOZCLIENT_PROJECT := nspr
+MOZCLIENT_PROJECT := $(NULL)
+MOZCLIENT_MODULES := mozilla/nsprpub
MOZCLIENT_FILE := mozilla/nsprpub/configure.in
MOZCLIENT_GETVERSION := grep -E '^MOD_(MAJOR|MINOR|PATCH)_VERSION' $(MOZCLIENT_FILE) | cut -d= -f2 | tr '\n' '.' | sed -e 's,\.$$,,'
MOZCLIENT_URL := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fnsprpub&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=1177522884&maxdate=1588258884&cvsroot=%2Fcvsroot'
diff --git a/src/nss.mk.in b/src/nss.mk.in
index 1c21af4..2436a0e 100644
--- a/src/nss.mk.in
+++ b/src/nss.mk.in
@@ -19,7 +19,8 @@
MOZCLIENT_TARGET := nss-orig
MOZCLIENT_APPNAME := nss
-MOZCLIENT_PROJECT := nss
+MOZCLIENT_PROJECT := $(NULL)
+MOZCLIENT_MODULES := mozilla/dbm mozilla/security/coreconf mozilla/security/dbm mozilla/security/nss
MOZCLIENT_FILE := mozilla/security/nss/lib/nss/nss.h
MOZCLIENT_GETVERSION := grep -E '^\#define NSS_V(MAJOR|MINOR|PATCH)' $(MOZCLIENT_FILE) | awk '{print $$3}' | tr '\n' '.' | sed -e 's,\.$$,,'
MOZCLIENT_URL := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=NSS&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fdbm+mozilla%2Fsecurity%2Fnss+mozilla%2Fsecurity%2Fcoreconf+mozilla%2Fsecurity%2Fdbm&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=month&mindate=&maxdate=&cvsroot=%2Fcvsroot'
diff --git a/src/patches/nspr_target.patch b/src/patches/nspr_target.patch
deleted file mode 100644
index 1da34c9..0000000
--- a/src/patches/nspr_target.patch
+++ /dev/null
@@ -1,84 +0,0 @@
----
- mozilla/client.mk | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-Index: mozclient/mozilla/client.mk
-===================================================================
---- mozclient.orig/mozilla/client.mk 2007-09-02 21:09:06.000000000 +0200
-+++ mozclient/mozilla/client.mk 2007-09-02 21:09:45.000000000 +0200
-@@ -54,16 +54,17 @@
- # export CVSROOT=:pserver:anonymous:anonymous@cvs-mirror.mozilla.org:/cvsroot
- # export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
- #
- # You must specify which products/modules you wish to checkout, with
- # MOZ_CO_PROJECT and MOZ_CO_MODULE variables.
- #
- # MOZ_CO_PROJECT possibilities include the following:
- # nss
-+# nspr
- # suite (Seamonkey suite)
- # browser (aka Firefox)
- # mail (aka Thunderbird)
- # minimo (small browser for devices)
- # composer (standalone composer, aka NVU)
- # calendar (aka Sunbird, use this to build the calendar extensions also)
- # xulrunner
- # camino
-@@ -102,16 +103,17 @@
- # MOZ_POSTFLIGHT_ALL } variables contain space-separated lists
- # MOZ_UNIFY_BDATE - Set to use the same bdate for each project in
- # MOZ_BUILD_PROJECTS
- #
-
- AVAILABLE_PROJECTS = \
- all \
- nss \
-+ nspr \
- suite \
- toolkit \
- browser \
- mail \
- minimo \
- composer \
- calendar \
- xulrunner \
-@@ -148,16 +150,20 @@
-
- MODULES_nss := \
- mozilla/dbm \
- mozilla/security/nss \
- mozilla/security/coreconf \
- mozilla/security/dbm \
- $(NULL)
-
-+MODULES_nspr := \
-+ mozilla/nsprpub \
-+ $(NULL)
-+
- MODULES_core := \
- $(MODULES_necko) \
- mozilla/caps \
- mozilla/content \
- mozilla/db/mdb \
- mozilla/db/mork \
- mozilla/docshell \
- mozilla/dom \
-@@ -608,17 +614,17 @@
- CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
- else
- CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
- endif
-
- ####################################
- # CVS defines for NSPR
- #
--NSPR_CO_MODULE = mozilla/nsprpub
-+NSPR_CO_MODULE = $(MODULES_nspr)
- NSPR_CO_FLAGS := -P
- ifdef MOZ_CO_FLAGS
- NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
- endif
- NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) $(if $(NSPR_CO_TAG),-r $(NSPR_CO_TAG),-A)
-
- # Can only pull the tip or branch tags by date
- ifeq (,$(filter-out HEAD %BRANCH,$(NSPR_CO_TAG)))
diff --git a/src/patches/nss_target.patch b/src/patches/nss_target.patch
deleted file mode 100644
index 2965161..0000000
--- a/src/patches/nss_target.patch
+++ /dev/null
@@ -1,92 +0,0 @@
----
- mozilla/client.mk | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-Index: mozclient/mozilla/client.mk
-===================================================================
---- mozclient.orig/mozilla/client.mk 2007-09-02 21:01:43.000000000 +0200
-+++ mozclient/mozilla/client.mk 2007-09-02 21:03:45.000000000 +0200
-@@ -53,16 +53,17 @@
- #
- # export CVSROOT=:pserver:anonymous:anonymous@cvs-mirror.mozilla.org:/cvsroot
- # export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
- #
- # You must specify which products/modules you wish to checkout, with
- # MOZ_CO_PROJECT and MOZ_CO_MODULE variables.
- #
- # MOZ_CO_PROJECT possibilities include the following:
-+# nss
- # suite (Seamonkey suite)
- # browser (aka Firefox)
- # mail (aka Thunderbird)
- # minimo (small browser for devices)
- # composer (standalone composer, aka NVU)
- # calendar (aka Sunbird, use this to build the calendar extensions also)
- # xulrunner
- # camino
-@@ -100,16 +101,17 @@
- # MOZ_POSTFLIGHT } each project, and after all projects; these
- # MOZ_POSTFLIGHT_ALL } variables contain space-separated lists
- # MOZ_UNIFY_BDATE - Set to use the same bdate for each project in
- # MOZ_BUILD_PROJECTS
- #
-
- AVAILABLE_PROJECTS = \
- all \
-+ nss \
- suite \
- toolkit \
- browser \
- mail \
- minimo \
- composer \
- calendar \
- xulrunner \
-@@ -139,16 +141,23 @@
- MODULES_NS_core := \
- $(MODULES_NS_necko) \
- mozilla/js \
- mozilla/js/src \
- mozilla/js/jsd \
- mozilla/db \
- $(NULL)
-
-+MODULES_nss := \
-+ mozilla/dbm \
-+ mozilla/security/nss \
-+ mozilla/security/coreconf \
-+ mozilla/security/dbm \
-+ $(NULL)
-+
- MODULES_core := \
- $(MODULES_necko) \
- mozilla/caps \
- mozilla/content \
- mozilla/db/mdb \
- mozilla/db/mork \
- mozilla/docshell \
- mozilla/dom \
-@@ -581,22 +590,17 @@
- MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
- endif
-
- endif # MOZ_BUILD_PROJECTS
-
- ####################################
- # CVS defines for NSS
- #
--NSS_CO_MODULE = \
-- mozilla/dbm \
-- mozilla/security/nss \
-- mozilla/security/coreconf \
-- mozilla/security/dbm \
-- $(NULL)
-+NSS_CO_MODULE = $(MODULES_nss)
-
- NSS_CO_FLAGS := -P
- ifdef MOZ_CO_FLAGS
- NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
- endif
- NSS_CO_FLAGS := $(NSS_CO_FLAGS) $(if $(NSS_CO_TAG),-r $(NSS_CO_TAG),-A)
-
- # Can only pull the tip or branch tags by date
diff --git a/src/patches/series b/src/patches/series
index 5f43f1b..9ab520f 100644
--- a/src/patches/series
+++ b/src/patches/series
@@ -1,3 +1 @@
-nss_target.patch
-nspr_target.patch
xulbrowser_target.patch
diff --git a/src/patches/xulbrowser_target.patch b/src/patches/xulbrowser_target.patch
index 93750b3..b596941 100644
--- a/src/patches/xulbrowser_target.patch
+++ b/src/patches/xulbrowser_target.patch
@@ -2,17 +2,17 @@
mozilla/client.mk | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
-Index: mozclient/mozilla/client.mk
+Index: mozclient-tmp/mozilla/client.mk
===================================================================
---- mozclient.orig/mozilla/client.mk
-+++ mozclient/mozilla/client.mk
-@@ -57,16 +57,17 @@
+--- mozclient-tmp.orig/mozilla/client.mk
++++ mozclient-tmp/mozilla/client.mk
+@@ -55,16 +55,17 @@
+ # export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
+ #
# You must specify which products/modules you wish to checkout, with
# MOZ_CO_PROJECT and MOZ_CO_MODULE variables.
#
# MOZ_CO_PROJECT possibilities include the following:
- # nss
- # nspr
# suite (Seamonkey suite)
# browser (aka Firefox)
+# xulbrowser (aka Firefox using libxul from xulrunner)
@@ -24,12 +24,12 @@ Index: mozclient/mozilla/client.mk
# camino
# tamarin
#
-@@ -107,16 +108,17 @@
+@@ -104,16 +105,17 @@
+ # MOZ_BUILD_PROJECTS
+ #
AVAILABLE_PROJECTS = \
all \
- nss \
- nspr \
suite \
toolkit \
browser \
@@ -42,9 +42,9 @@ Index: mozclient/mozilla/client.mk
camino \
necko \
tamarin \
-@@ -272,38 +274,67 @@
- editor/ui \
+@@ -260,38 +262,67 @@
extensions/reporter \
+ extensions/spellcheck \
$(NULL)
BOOTSTRAP_suite := \