diff --git a/build/mac/build_scripts/MozillaCheckoutList.txt b/build/mac/build_scripts/MozillaCheckoutList.txt index 34028fffbfa..e6f6cee973f 100644 --- a/build/mac/build_scripts/MozillaCheckoutList.txt +++ b/build/mac/build_scripts/MozillaCheckoutList.txt @@ -3,11 +3,11 @@ # where tag and date are optional (non-trailing commas are required) # # Examples: -# mozilla/nsprpub, NSPRPUB_CLIENT_BRANCH +# mozilla/nsprpub, NSPRPUB_CLIENT_TAG # mozilla/gc, , 10/25/2000 12:00:00 # -mozilla/nsprpub, NSPRPUB_CLIENT_BRANCH +mozilla/nsprpub, NSPRPUB_CLIENT_TAG mozilla/security/nss, NSS_CLIENT_TAG mozilla/security/psm, mozilla/security/manager, diff --git a/client.mak b/client.mak index 98d99a6a7aa..ad3fe5cbd91 100644 --- a/client.mak +++ b/client.mak @@ -134,7 +134,7 @@ NSPR_CO_FLAGS=$(MOZ_CO_FLAGS) !if "$(NSPR_CO_TAG)" != "" NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG) !else -NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r NSPRPUB_CLIENT_BRANCH +NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r NSPRPUB_CLIENT_TAG !endif CVSCO_NSPR = cvs -q $(CVS_FLAGS) co $(NSPR_CO_FLAGS) diff --git a/client.mk b/client.mk index a7ac92f683e..8369c00b065 100644 --- a/client.mk +++ b/client.mk @@ -53,7 +53,7 @@ # For branches, uncomment the MOZ_CO_TAG line with the proper tag, # and commit this file on that tag. #MOZ_CO_TAG = -NSPR_CO_TAG = NSPRPUB_CLIENT_BRANCH +NSPR_CO_TAG = NSPRPUB_CLIENT_TAG 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