* Add target for sunbird using MOZILLA_1_8_BRANCH

  - update Makefile and README

2 files changed, 40 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 8c59d71..3e33b47 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,11 @@ DEBIAN_SM2_APPNAME  := seamonkey-2.0
 DEBIAN_SM2_FILE     := mozilla/suite/config/version.txt
 DEBIAN_SM2_URL      := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot'
 
+DEBIAN_SB0_TARGET   := sunbird-orig
+DEBIAN_SB0_APPNAME  := lightning-sunbird
+DEBIAN_SB0_FILE     := mozilla/calendar/sunbird/config/version.txt
+DEBIAN_SB0_URL      := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=CalendarClient&branch=MOZILLA_1_8_BRANCH&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot'
+
 ############################################################################
 
 EXCLUDE := --exclude=CVS --exclude=.cvsignore
@@ -68,6 +73,7 @@ help:
 	@printf "   make %-20s  Create %s sources tarball\n" $(DEBIAN_SM2_TARGET) $(DEBIAN_SM2_APPNAME)
 	@printf "   make %-20s  Create %s sources tarball\n" $(DEBIAN_NSS_TARGET) $(DEBIAN_NSS_APPNAME)
 	@printf "   make %-20s  Create %s sources tarball\n" $(DEBIAN_NSPR_TARGET) $(DEBIAN_NSPR_APPNAME)
+	@printf "   make %-20s  Create %s sources tarball (MOZILLA_1_8_BRANCH)\n" $(DEBIAN_SB0_TARGET) $(DEBIAN_SB0_APPNAME)
 	@echo
 	@echo "  you can also recreate a tarball from a specific timestamp by specifying"
 	@echo "  DEBIAN_DATE in the form YYYYMMDDtHHMM"
@@ -95,6 +101,11 @@ $(MOZ_CLIENT): deps
 	cvs -d $(CVS_LOC) co $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $@
 	rm -rf .pc $(STAMP)
 
+client18: deps
+	cvs -d $(CVS_LOC) co -r MOZILLA_1_8_BRANCH $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $(MOZ_CLIENT)
+
+client: $(STAMP)
+
 $(DEBIAN_FF3_FILE):
 	cvs -d $(CVS_LOC) co $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $@
 $(DEBIAN_XUL_FILE):
@@ -107,8 +118,8 @@ $(DEBIAN_NSS_FILE):
 	cvs -d $(CVS_LOC) co $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $@
 $(DEBIAN_NSPR_FILE):
 	cvs -d $(CVS_LOC) co $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $@
-
-client: $(STAMP)
+$(DEBIAN_SB0_FILE):
+	cvs -d $(CVS_LOC) co -r MOZILLA_1_8_BRANCH $(DEBIAN_CO_DATE) $(DEBIAN_CO_TAG) $@
 
 status: $(MOZ_CLIENT)
 	( cd mozilla ; cvs status -v client.mk )
@@ -256,4 +267,27 @@ $(DEBIAN_NSPR_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_NSPR_FILE)
 	rm -rf cvsco.log* $(STAMP) .pc $(DEBIAN_NSPR_APPNAME)-$$DEBIAN_NSPR_VERSION ; \
 	ls -l $(DEBIAN_NSPR_APPNAME)_$$DEBIAN_NSPR_VERSION.orig.tar.gz
 
-.PHONY : all clean help deps client unpatch status
+$(DEBIAN_SB0_TARGET): client18 $(DEBIAN_SB0_FILE)
+	URL=$(DEBIAN_SB0_URL) ; \
+	if [ "$(DEBIAN_TAG)" != "" ] ; then \
+	DEBIAN_SB0_VERSION=$(DEBIAN_DTAG) ; \
+	make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=calendar $(DEBIAN_MOZ_CO_TAG) ; \
+	else \
+	if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_SB0_DATE=$(DEBIAN_DATE) ; else DEBIAN_SB0_DATE=`$(GET)` ; fi ; \
+	DEBIAN_SB0_CO_DATE="`echo $$DEBIAN_SB0_DATE | sed -e 's/[rt]/ /'`" ; \
+	DEBIAN_SB0_VERSION="`tail -1 $(DEBIAN_SB0_FILE) | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'`~cvs$$DEBIAN_SB0_DATE" ; \
+	make -f $(MOZ_CLIENT) checkout -r MOZILLA_1_8_BRANCH MOZ_CO_PROJECT=calendar MOZ_CO_DATE="$$DEBIAN_SB0_CO_DATE" ; \
+	fi ; \
+	( cd mozilla ; sh ../$(DEBIAN_EXCLUDE_SCRIPT) > REMOVED+$(NOBINONLY).txt 2>&1 ) ; \
+	DEBIAN_SB0_VERSION=$$DEBIAN_SB0_VERSION+$(NOBINONLY) ; \
+	rm -rf $(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION $(DEBIAN_SB0_APPNAME)_$$DEBIAN_SB0_VERSION.orig.tar.gz && \
+	mkdir $(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION && \
+	echo "Creating $(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION/$(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION-source.tar.bz2 ..." && \
+	tar jcf $(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION/$(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION-source.tar.bz2 $(EXCLUDE) mozilla && \
+	rm -f $(DEBIAN_SB0_APPNAME)_$$DEBIAN_SB0_VERSION.orig.tar.gz && \
+	echo "Creating $(DEBIAN_SB0_APPNAME)_$$DEBIAN_SB0_VERSION.orig.tar.gz ..." && \
+	tar zcf $(DEBIAN_SB0_APPNAME)_$$DEBIAN_SB0_VERSION.orig.tar.gz $(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION && \
+	rm -rf mozilla cvsco.log* $(STAMP) .pc $(DEBIAN_SB0_APPNAME)-$$DEBIAN_SB0_VERSION ; \
+	ls -l $(DEBIAN_SB0_APPNAME)_$$DEBIAN_SB0_VERSION.orig.tar.gz
+
+.PHONY : all clean help deps client client18 unpatch status
diff --git a/README b/README
index 5b2c8af..a346352 100644
--- a/README
+++ b/README
@@ -21,6 +21,9 @@ To use:
 	   make seamonkey-orig        Create seamonkey-2.0 sources tarball
 	   make nss-orig              Create nss sources tarball
   	   make nspr-orig             Create nspr sources tarball
+	   make sunbird-orig          Create lightning-sunbird sources tarball (*)
+
+       (*): this is in the MOZILLA_1_8_BRANCH, while everything else is in trunk
 
   You can also recreate a tarball from a specific timestamp by specifying
   DEBIAN_DATE in the form YYYYMMDDtHHMM