зеркало из https://github.com/mozilla/pjs.git
Bugzilla bug #27457: pull the NSPR tag NSPRPUB_4_0_BETA_20000215 and
bump NSPR_VERSION to 4. Modified files: client.mak, client.mk, configure, configure.in, build/mac/NGLayoutBuildList.pm, config/config.mak
This commit is contained in:
Родитель
9adf0096b6
Коммит
40c478f70c
|
@ -197,7 +197,7 @@ sub Checkout()
|
|||
# activate MacCVS
|
||||
ActivateApplication('Mcvs');
|
||||
|
||||
my($nsprpub_tag) = "NSPRPUB_20000208";
|
||||
my($nsprpub_tag) = "NSPRPUB_4_0_BETA_20000215";
|
||||
|
||||
#//
|
||||
#// Checkout commands
|
||||
|
|
|
@ -95,7 +95,7 @@ CVSCO_NETWORK = $(CVSCO)
|
|||
!if "$(NSPR_CO_TAG)" != ""
|
||||
NSPR_CO_FLAGS=-r $(NSPR_CO_TAG)
|
||||
!else
|
||||
NSPR_CO_FLAGS=-r NSPRPUB_20000201
|
||||
NSPR_CO_FLAGS=-r NSPRPUB_4_0_BETA_20000215
|
||||
!endif
|
||||
|
||||
CVSCO_NSPR = cvs -q $(CVS_FLAGS) co $(NSPR_CO_FLAGS) -P
|
||||
|
|
|
@ -147,7 +147,7 @@ endif
|
|||
NSPR_CO_MODULE = mozilla/nsprpub
|
||||
NSPR_CO_FLAGS := -P
|
||||
CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)
|
||||
NSPR_CO_TAG = NSPRPUB_20000201
|
||||
NSPR_CO_TAG = NSPRPUB_4_0_BETA_20000215
|
||||
|
||||
ifdef NSPR_CO_TAG
|
||||
NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
|
||||
|
|
|
@ -347,7 +347,7 @@ MKCPYFLAGS= -i
|
|||
#// Common Libraries
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
NSPR_VERSION=3
|
||||
NSPR_VERSION=4
|
||||
LIBNSPR=$(DIST)\lib\nspr$(NSPR_VERSION).lib $(DIST)\lib\plds$(NSPR_VERSION).lib $(DIST)\lib\plc$(NSPR_VERSION).lib
|
||||
LIBPLC=$(DIST)\lib\plc$(NSPR_VERSION).lib
|
||||
|
||||
|
|
|
@ -817,7 +817,7 @@ _SUBDIR_CONFIG_ARGS="$ac_configure_args"
|
|||
|
||||
MOZJPEG=62
|
||||
MOZPNG=10002
|
||||
NSPR_VERSION=3
|
||||
NSPR_VERSION=4
|
||||
|
||||
GTK_VERSION=1.2.0
|
||||
LIBIDL_VERSION=0.6.3
|
||||
|
|
|
@ -71,7 +71,7 @@ dnl Set the version number of the libs included with mozilla
|
|||
dnl ========================================================
|
||||
MOZJPEG=62
|
||||
MOZPNG=10002
|
||||
NSPR_VERSION=3
|
||||
NSPR_VERSION=4
|
||||
|
||||
dnl Set the minimum version of toolkit libs used by mozilla
|
||||
dnl ========================================================
|
||||
|
|
Загрузка…
Ссылка в новой задаче