summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile41
-rw-r--r--README21
-rw-r--r--patches/nspr_target.patch84
-rw-r--r--patches/nss_target.patch92
-rw-r--r--patches/series3
-rw-r--r--patches/xulbrowser_target.patch114
6 files changed, 355 insertions, 0 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..edca938
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,41 @@
+STAMP ?= stamped
+
+DEBIAN_DATE = $(shell date +%Y%m%d)
+
+DEBIAN_FF3_APPNAME = firefox-trunk
+DEBIAN_FF3_VERSION = $(shell cat mozilla/browser/config/version.txt | sed -e 's/a\([0-9]*\)pre/~a\1/')~cvs$(DEBIAN_DATE)
+
+all: mozilla/client.mk mozilla/browser/config/version.txt $(STAMP)
+
+
+mozilla/browser/config/version.txt:
+ cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co mozilla/browser/config/version.txt
+
+mozilla/client.mk:
+ cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co mozilla/client.mk
+ rm -rf .pc $(STAMP)
+
+patch: mozilla/client.mk $(STAMP)
+$(STAMP):
+ @echo Patching
+ quilt --quiltrc /dev/null push -a || test $$? = 2
+ touch $(STAMP)
+
+unpatch:
+ @echo Unpatching
+ -quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+ rm -rf .pc $(STAMP)
+
+clean: unpatch
+ rm -rf cvsco.log* mozilla/client.mk
+
+
+ff3-orig: xulbrowser-orig
+
+xulbrowser-orig: mozilla/client.mk mozilla/browser/config/version.txt $(STAMP)
+ make -f mozilla/client.mk checkout MOZ_CO_PROJECT=xulbrowser
+ rm -rf $(DEBIAN_FF3_APPNAME)-$(DEBIAN_FF3_VERSION) $(DEBIAN_FF3_APPNAME)_$(DEBIAN_FF3_VERSION).orig.tar.gz
+ mkdir $(DEBIAN_FF3_APPNAME)-$(DEBIAN_FF3_VERSION)
+ tar jcf $(DEBIAN_FF3_APPNAME)-$(DEBIAN_FF3_VERSION)/browser-snapshot-$(DEBIAN_DATE).tar.bz2 --exclude=CVS --exclude=.cvsignore mozilla
+ tar zcf $(DEBIAN_FF3_APPNAME)_$(DEBIAN_FF3_VERSION).orig.tar.gz $(DEBIAN_FF3_APPNAME)-$(DEBIAN_FF3_VERSION)
+ rm -rf mozilla cvsco.log $(STAMP) .pc $(DEBIAN_FF3_APPNAME)-$(DEBIAN_FF3_VERSION)
diff --git a/README b/README
new file mode 100644
index 0000000..88d6374
--- /dev/null
+++ b/README
@@ -0,0 +1,21 @@
+This package has been created by Fabien Tassin <fta@sofaraway.org>.
+
+It is *not* a debian package.
+
+It is composed of just a Makefile and a pile of patches.
+Those patches are targetting mozilla/client.mk and add targets to
+fetch respectively nss, nspr and xulbrowser (browser build with libxul
+from xulrunner package).
+
+Depends on cvs and quilt.
+
+To use:
+
+ $ make (will fetch and patch mozilla/client.mk from cvs)
+
+ $ make -f mozilla/client.mk checkout MOZ_CO_PROJECT=nss
+ $ make -f mozilla/client.mk checkout MOZ_CO_PROJECT=nspr
+ $ make -f mozilla/client.mk checkout MOZ_CO_PROJECT=xulbrowser
+
+ $ make xulbrowser-orig (will create a tarball suitable for firefox-trunk)
+ (or make ff3-orig, which is an alias)
diff --git a/patches/nspr_target.patch b/patches/nspr_target.patch
new file mode 100644
index 0000000..1da34c9
--- /dev/null
+++ b/patches/nspr_target.patch
@@ -0,0 +1,84 @@
+---
+ 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/patches/nss_target.patch b/patches/nss_target.patch
new file mode 100644
index 0000000..2965161
--- /dev/null
+++ b/patches/nss_target.patch
@@ -0,0 +1,92 @@
+---
+ 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/patches/series b/patches/series
new file mode 100644
index 0000000..5f43f1b
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,3 @@
+nss_target.patch
+nspr_target.patch
+xulbrowser_target.patch
diff --git a/patches/xulbrowser_target.patch b/patches/xulbrowser_target.patch
new file mode 100644
index 0000000..520a02a
--- /dev/null
+++ b/patches/xulbrowser_target.patch
@@ -0,0 +1,114 @@
+---
+ mozilla/client.mk | 36 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+Index: mozclient/mozilla/client.mk
+===================================================================
+--- mozclient.orig/mozilla/client.mk 2007-09-03 00:16:07.000000000 +0200
++++ mozclient/mozilla/client.mk 2007-09-03 00:22:58.000000000 +0200
+@@ -57,16 +57,17 @@
+ # 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)
+ # 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
+ # tamarin
+ #
+@@ -107,16 +108,17 @@
+
+ AVAILABLE_PROJECTS = \
+ all \
+ nss \
+ nspr \
+ suite \
+ toolkit \
+ browser \
++ xulbrowser \
+ mail \
+ minimo \
+ composer \
+ calendar \
+ xulrunner \
+ camino \
+ necko \
+ tamarin \
+@@ -272,38 +274,66 @@
+ editor/ui \
+ extensions/reporter \
+ $(NULL)
+
+ BOOTSTRAP_suite := \
+ $(BOOTSTRAP_toolkit) \
+ $(NULL)
+
++MODULES_NS_xulbrowser := \
++ $(MODULES_NS_necko) \
++ $(NULL)
++
+ MODULES_NS_browser := \
+ $(MODULES_NS_toolkit) \
+ $(NULL)
+
++MODULES_xulbrowser := \
++ mozilla/README \
++ mozilla/config \
++ mozilla/build \
++ mozilla/intl \
++ mozilla/modules/libpref \
++ mozilla/tools/test-harness \
++ mozilla/extensions \
++ mozilla/toolkit \
++ mozilla/xpinstall \
++ mozilla/browser \
++ mozilla/other-licenses/branding/firefox \
++ mozilla/other-licenses/7zstub/firefox \
++ $(NULL)
++
+ MODULES_browser := \
+ $(MODULES_toolkit) \
+ mozilla/browser \
+ mozilla/other-licenses/branding/firefox \
+ mozilla/other-licenses/7zstub/firefox \
+ $(NULL)
+
+-LOCALES_browser := \
+- $(LOCALES_toolkit) \
++LOCALES_xulbrowser := \
+ browser \
+ extensions/reporter \
+ extensions/spellcheck \
+ other-licenses/branding/firefox \
+ $(NULL)
+
++LOCALES_browser := \
++ $(LOCALES_toolkit) \
++ $(LOCALES_xulbrowser) \
++ $(NULL)
++
++BOOTSTRAP_xulbrowser := \
++ mozilla/browser/config/version.txt \
++ mozilla/browser/config/mozconfig \
++ $(NULL)
++
+ BOOTSTRAP_browser := \
+ $(BOOTSTRAP_toolkit) \
+- mozilla/browser/config/mozconfig \
++ $(BOOTSTRAP_xulbrowser) \
+ $(NULL)
+
+ MODULES_NS_minimo := \
+ $(MODULES_NS_toolkit) \
+ $(NULL)
+
+ MODULES_minimo := \
+ $(MODULES_toolkit) \