adding new directories to the pull scripts for new imagelib. bug 70938 r=bryner sr=cls

client.mak

@@ -44,6 +44,9 @@ MOZ_OBJDIR = WIN32_O.OBJ
 #NSPR_CO_TAG=SeaMonkey_M17_BRANCH
 #PSM_CO_TAG=SeaMonkey_M17_BRANCH
 #LDAPCSDK_CO_TAG=SeaMonkey_M17_BRANCH
+#IMGLIB2_BRANCH=SeaMonkey_M17_BRANCH
+#GFX2_BRANCH=SeaMonkey_M17_BRANCH
+
 
 !if "$(MOZ_BRANCH)" != ""
 CVS_BRANCH=-r $(MOZ_BRANCH)
@@ -90,7 +93,8 @@ CVSCO_TAG = cvs -q co -P
 
 # Branch tags we use
 
-IMGLIB_BRANCH =
+IMGLIB2_BRANCH =
+GFX2_BRANCH =
 PLUGIN_BRANCH =
 XPCOM_BRANCH =
 
@@ -105,7 +109,8 @@ CVSCO_PLUGIN = $(CVSCO) -A
 !endif
 
 CVSCO_XPCOM = $(CVSCO)
-CVSCO_IMGLIB = $(CVSCO)
+CVSCO_IMGLIB2 = $(CVSCO)
+CVSCO_GFX2 = $(CVSCO)
 CVSCO_RAPTOR = $(CVSCO)
 CVSCO_LIZARD = $(CVSCO)
 CVSCO_NETWORK = $(CVSCO)
@@ -158,6 +163,34 @@ LDAPCSDK_CO_FLAGS=-r LDAPCSDK_40_BRANCH
 
 CVSCO_LDAPCSDK = cvs -q $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) -P
 
+#//------------------------------------------------------------------------
+#// Figure out how to pull new image library.
+#// If no IMGLIB2_CO_TAG is specified, use the default tag
+#//------------------------------------------------------------------------
+
+!if "$(IMGLIB2_CO_TAG)" != ""
+IMGLIB2_CO_FLAGS=-r $(IMGLIB2_CO_TAG)
+!else
+IMGLIB2_CO_FLAGS=
+!endif
+
+CVSCO_IMGLIB2 = cvs -q $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) -P
+
+#//------------------------------------------------------------------------
+#// Figure out how to pull new image library.
+#// If no GFX2_CO_TAG is specified, use the default tag
+#//------------------------------------------------------------------------
+
+!if "$(GFX2_CO_TAG)" != ""
+GFX2_CO_FLAGS=-r $(GFX2_CO_TAG)
+!else
+GFX2_CO_FLAGS=
+!endif
+
+CVSCO_GFX2 = cvs -q $(CVS_FLAGS) co $(GFX2_CO_FLAGS) -P
+
+
+
 ## The master target
 ############################################################
 
@@ -169,7 +202,7 @@ pull_and_build_all: pull_all depend build_all
 
 pull_clobber_and_build_all: pull_all clobber_all build_all
 
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_seamonkey
+pull_all: pull_nspr pull_psm pull_ldapcsdk pull_gfx2 pull_imglib2 pull_seamonkey
 
 pull_nspr: pull_clientmak
       cd $(MOZ_SRC)\.
@@ -190,6 +223,14 @@ pull_ldapcsdk:
 	cd $(MOZ_SRC)\.
 	$(CVSCO_LDAPCSDK) mozilla/directory/c-sdk
 
+pull_gfx2:
+  cd $(MOZ_SRC)\.
+  $(CVSCO_GFX2) mozilla/gfx2
+
+pull_imglib2:
+  cd $(MOZ_SRC)\.
+  $(CVSCO_IMGLIB2) mozilla/modules/libpr0n
+
 pull_xpconnect: pull_nspr
 	cd $(MOZ_SRC)\.
 	$(CVSCO) mozilla/include

client.mk

@@ -57,6 +57,8 @@ NSPR_CO_TAG = NSPRPUB_CLIENT_BRANCH
 PSM_CO_TAG = #We will now build PSM from the tip instead of a branch.
 NSS_CO_TAG = NSS_CLIENT_TAG
 LDAPCSDK_CO_TAG = LDAPCSDK_40_BRANCH
+GFX2_CO_TAG = 
+IMGLIB2_CO_TAG = 
 BUILD_MODULES = all
 
 #######################################################################
@@ -225,6 +227,26 @@ ifdef LDAPCSDK_CO_TAG
 endif
 CVSCO_LDAPCSDK = cvs $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
 
+####################################
+# CVS defines for gfx2
+#
+GFX2_CO_MODULE = mozilla/gfx2
+GFX2_CO_FLAGS := -P
+ifdef GFX2_CO_TAG
+  GFX2_CO_FLAGS := $(GFX2_CO_FLAGS) -r $(GFX2_CO_TAG)
+endif
+CVSCO_GFX2 = cvs $(CVS_FLAGS) co $(GFX2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(GFX2_CO_MODULE)
+
+####################################
+# CVS defines for new image library
+#
+IMGLIB2_CO_MODULE = mozilla/modules/libpr0n
+IMGLIB2_CO_FLAGS := -P
+ifdef IMGLIB2_CO_TAG
+  IMGLIB2_CO_FLAGS := $(IMGLIB2_CO_FLAGS) -r $(IMGLIB2_CO_TAG)
+endif
+CVSCO_IMGLIB2 = cvs $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
+
 ####################################
 # CVS defines for standalone modules
 #
@@ -249,6 +271,12 @@ endif
 ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS)))
   CVSCO_LDAPCSDK :=
 endif
+ifeq (,$(filter gfx2, $(BUILD_MODULE_CVS)))
+  CVSCO_GFX2 :=
+endif
+ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
+  CVSCO_IMGLIB2 :=
+endif
 else
   # Do not pull PSM/NSS by default
   CVSCO_PSM :=
@@ -316,6 +344,8 @@ real_checkout:
 	cvs_co $(CVSCO_PSM) && \
 	cvs_co $(CVSCO_NSS) && \
         cvs_co $(CVSCO_LDAPCSDK) && \
+        cvs_co $(CVSCO_GFX2) && \
+        cvs_co $(CVSCO_IMGLIB2) && \
 	cvs_co $(CVSCO_SEAMONKEY) && \
 	cvs_co $(CVSCO_NOSUBDIRS)
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)