зеркало из https://github.com/mozilla/pjs.git
Fix bug # 138545 - more flexibility needed for pre-built components
location. Introduced component specific RELEASE_TREE macros, e.g., NSPR_RELEASE_TREE.
This commit is contained in:
mcs%netscape.com
Родитель
3f917cef76
Коммит
51467f9cd2
|
|
@ -166,11 +166,14 @@ ifeq ($(HAVE_CCONF), 1)
|
|||
# cd $(CORECONFDIR)/dbm; \
|
||||
# $(MAKE) VERSION=$(DBM_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
cd $(CORECONFDIR)/nspr20; \
|
||||
$(MAKE) VERSION=$(NSPR_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
$(MAKE) RELEASE_TREE=$(NSPR_RELEASE_TREE) \
|
||||
VERSION=$(NSPR_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
cd $(CORECONFDIR)/security; \
|
||||
$(MAKE) VERSION=$(NSS_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
$(MAKE) RELEASE_TREE=$(NSS_RELEASE_TREE) \
|
||||
VERSION=$(NSS_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
cd $(CORECONFDIR)/svrcore; \
|
||||
$(MAKE) VERSION=$(SVRCORE_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
$(MAKE) RELEASE_TREE=$(SVRCORE_RELEASE_TREE) \
|
||||
VERSION=$(SVRCORE_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -161,14 +161,9 @@ NSCCK_LIBNAME =libnscck$(NLS_LIBVERSION).$(LIB_SUFFIX)
|
|||
NSSB_LIBNAME =libnssb$(NLS_LIBVERSION).$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifdef RELEASE_TREE
|
||||
LIBNLS_INCLUDES_LOC = $(RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/include
|
||||
LIBNLS_LIB_LOC = $(RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/lib
|
||||
else
|
||||
LIBNLS_INCLUDES_LOC = /share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/include
|
||||
LIBNLS_LIB_LOC = /share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/lib
|
||||
LIBNLS_INCLUDES_LOC = $(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/include
|
||||
LIBNLS_LIB_LOC = $(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/lib
|
||||
|
||||
endif
|
||||
LIBNLS_DIR = ../../../../../dist/libnls$(NLS_LIBVERSION)
|
||||
ifeq ($(COMPONENT_PULL_METHOD), FTP)
|
||||
LIBNLS_INCLUDES =../../../../../dist/libnls$(NLS_LIBVERSION)/$(OBJDIR_NAME)/include
|
||||
|
|
|
|||
|
|
@ -20,17 +20,22 @@
|
|||
# Contributor(s):
|
||||
#
|
||||
|
||||
COMPONENTS_DIR = /share/builds/components
|
||||
|
||||
# NSPR - Netscape Portable Runtime
|
||||
NSPR_LIBVERSION = 4
|
||||
NSPR_RELEASE_TAG = v4.1.2
|
||||
NSPR_RELEASE_TREE = $(COMPONENTS_DIR)
|
||||
|
||||
# NSS - Network Security Services
|
||||
NSSVERS = 3
|
||||
NSS_RELEASE_TAG = NSS_3_3_2_RTM
|
||||
#NSS_DYNAMIC_SOFTOKN = 1
|
||||
NSS_RELEASE_TREE = $(COMPONENTS_DIR)
|
||||
|
||||
# SVRCORE - Client/server utility library
|
||||
SVRCORE_RELEASE_TAG = SVRCORE_3_3_RTM
|
||||
SVRCORE_RELEASE_TREE = $(COMPONENTS_DIR)
|
||||
|
||||
# LDAP library
|
||||
LDAPVERS = 50
|
||||
|
|
@ -64,6 +69,7 @@ SSLDAPVERS_SUFFIX = 5.0
|
|||
# libNLS - National Language Support.
|
||||
NLS_LIBVERSION = 31
|
||||
LIBNLS_RELDATE = v3.2
|
||||
LIBNLS_RELEASE_TREE = $(COMPONENTS_DIR)
|
||||
|
||||
# Some components already had existing Solaris 5.8 symbolic
|
||||
# link to a Solaris 5.6 version. Hence, the new respun components
|
||||
|
|
|
|||
|
|
@ -212,14 +212,6 @@ endif
|
|||
#
|
||||
####################################################################
|
||||
|
||||
MDIST = /share/builds/components
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
MDIST = //helium/dist
|
||||
MDIST_DOS = $(subst /,\\,$(MDIST))
|
||||
endif
|
||||
|
||||
# RELEASE_DIR is ns/dist/<module name>
|
||||
|
||||
RELEASE_DIR = $(NSDEPTH)/dist/release/$(MOD_NAME)
|
||||
|
||||
RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ ifeq ($(HAVE_LIBNLS), 1)
|
|||
# $(NLS_VERSION_FILE)
|
||||
sh ../../build/compver.sh $(LIBNLS_DIR) $(LIBNLS_RELDATE) \
|
||||
$(OBJDIR_NAME) ../../../../dist ldapsdk \
|
||||
/share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
|
||||
$(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
|
||||
libnls$(NLS_LIBVERSION) \
|
||||
"include lib conv$(NLS_LIBVERSION) locale$(NLS_LIBVERSION)" \
|
||||
../../../../../dist/libnls$(NLS_LIBVERSION)/$(OBJDIR_NAME)/locale$(NLS_LIBVERSION)/index.txt
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ ifeq ($(HAVE_LIBNLS), 1)
|
|||
# $(NLS_VERSION_FILE)
|
||||
sh ../../build/compver.sh $(LIBNLS_DIR) $(LIBNLS_RELDATE) \
|
||||
$(OBJDIR_NAME) ../../../../dist ldapsdk \
|
||||
/share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
|
||||
$(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
|
||||
libnls$(NLS_LIBVERSION) \
|
||||
"include lib conv$(NLS_LIBVERSION) locale$(NLS_LIBVERSION)" \
|
||||
../../../../../dist/libnls$(NLS_LIBVERSION)/$(OBJDIR_NAME)/locale$(NLS_LIBVERSION)/index.txt
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче