Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4776
Modified Files:
Makefile buildpaths.mk components.mk internal_buildpaths.mk
nsconfig.mk
Log Message:
[186105] Admin Server Makefile updates for Internal build
. stopped pulling and packaging DBM
. removed internal/external switch for AdminUtil and SetupUtil
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile 21 Mar 2006 18:33:37 -0000 1.18
+++ Makefile 21 Mar 2006 19:48:49 -0000 1.19
@@ -77,7 +77,7 @@
if test ! -d $(NSPLATFORM_DIR); then mkdir $(NSPLATFORM_DIR); fi;
$(PERL5) buildnum.pl -p $(NSPLATFORM_DIR)
-nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(LIBLDAP) $(LIBADMINUTIL)
$(LIBICU) $(SETUPUTIL) $(MOD_ADMSERV) $(MOD_RESTARTD) $(MOD_NSS) $(ADMDOC) end_time
+nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU)
$(SETUPUTIL) $(MOD_ADMSERV) $(MOD_RESTARTD) $(MOD_NSS) $(ADMDOC) end_time
#
# Notice that BUILD_MODULE is not supplied directly on this target.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildpaths.mk 21 Mar 2006 18:33:37 -0000 1.8
+++ buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.9
@@ -70,23 +70,16 @@
endif
NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#NSPR_BUILD_DIR = $(BUILD_ROOT)/../nspr-4.4.1
-
-DBM_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#DBM_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#SECURITY_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.16
MOD_ADMSERV_SOURCE_ROOT = $(BUILD_ROOT)/../mod_admserv
MOD_RESTARTD_SOURCE_ROOT = $(BUILD_ROOT)/../mod_restartd
MOD_NSS_SOURCE_ROOT = $(BUILD_ROOT)/../mod_nss
ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
-#ICU_BUILD_DIR = $(BUILD_ROOT)/../icu-2.4
ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
#ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- components.mk 21 Mar 2006 18:33:37 -0000 1.42
+++ components.mk 21 Mar 2006 19:48:49 -0000 1.43
@@ -80,31 +80,6 @@
else # INTERNAL_BUILD
@if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ;
fi
endif
-###############################################
-# DBM Library
-##############################################
-
-DBM_RELDATE = DBM_1_61_RTM
-
-ifeq ($(INT_DBM), 1)
-BASE_DBM = $(INT_DIR)/dbm/$(DBM_RELDATE)
-else
-BASE_DBM = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)
-endif
-
-$(LIBDBM):
-ifdef INTERNAL_BUILD
-ifneq ($(ARCH), WINNT)
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir
$(NSCP_DISTDIR)/dbm -componentdir $(BASE_DBM) -files xpheader.jar -unzip
$(NSCP_DISTDIR)/include
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir
$(NSCP_DISTDIR)/dbm -componentdir $(BASE_DBM)/$(NSOBJDIR_NAME) -files mdbinary.jar -unzip
$(NSCP_DISTDIR)
-else
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(NSCP_DISTDIR)/dbm -componentdir
$(BASE_DBM) -files xpheader.jar -unzip $(NSCP_DISTDIR)/include
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(NSCP_DISTDIR)/dbm -componentdir
$(BASE_DBM)/$(NSOBJDIR_NAME) -files mdbinary.jar -unzip $(NSCP_DISTDIR)
-endif
-else # INTERNAL_BUILD
- @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ;
fi
-endif
-
################################################
# SECURITY LIBRARY
@@ -170,7 +145,6 @@
SETUPUTIL_OBJDIR = $(NSOBJDIR_NAME)
-ifeq ($(BUILD_MODE), int)
ifeq ($(INT_SETUPUTIL), 1)
#intenal & integration
BASE_SETUPUTIL =
$(INT_DIR)/$(SETUPUTIL_COMPNAME)/$(SETUPUTIL_RELDATE)/$(SETUPUTIL_OBJDIR)
@@ -178,10 +152,6 @@
#intenal & components
BASE_SETUPUTIL =
$(COMPONENTS_DIR)/$(SETUPUTIL_COMPNAME)/$(SETUPUTIL_RELDATE)/$(SETUPUTIL_OBJDIR)
endif
-else
-#fedora
- BASE_SETUPUTIL =
$(FED_COMPONENTS_DIR)/$(SETUPUTIL_COMPNAME)/$(SETUPUTIL_RELDATE)/$(SETUPUTIL_OBJDIR)
-endif
SETUPUTIL_DEST = $(SETUPUTIL_ROOT)/$(SETUPUTIL_OBJDIR)
@@ -208,7 +178,6 @@
ADMINUTILOBJDIR = $(NSOBJDIR_NAME)
-ifeq ($(BUILD_MODE), int)
ifeq ($(INT_ADMINUTIL), 1)
#intenal & integration
BASE_ADMINUTIL =
$(INT_DIR)/$(ADMINUTIL_COMPNAME)/$(ADMINUTIL_VERSION)/$(ADMINUTILOBJDIR)
@@ -216,11 +185,6 @@
#intenal & components
BASE_ADMINUTIL =
$(COMPONENTS_DIR)/$(ADMINUTIL_COMPNAME)/$(ADMINUTIL_VERSION)/$(ADMINUTILOBJDIR)
endif
-else
-#fedora
- BASE_ADMINUTIL =
$(FED_COMPONENTS_DIR)/$(ADMINUTIL_COMPNAME)/$(ADMINUTIL_VERSION)/$(ADMINUTILOBJDIR)
-endif
-
$(LIBADMINUTIL):
ifdef INTERNAL_BUILD
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal_buildpaths.mk 21 Mar 2006 18:33:37 -0000 1.4
+++ internal_buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.5
@@ -61,11 +61,6 @@
NSPR_BUILD_DIR = $(NSCP_DISTDIR)
endif # NSPR_SOURCE_ROOT
-#DBM_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef DBM_SOURCE_ROOT
-DBM_BUILD_DIR = $(NSCP_DISTDIR)
-endif # DBM_SOURCE_ROOT
-
#SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
ifndef SECURITY_SOURCE_ROOT
SECURITY_BUILD_DIR = $(NSCP_DISTDIR)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nsconfig.mk 21 Mar 2006 18:33:37 -0000 1.26
+++ nsconfig.mk 21 Mar 2006 19:48:49 -0000 1.27
@@ -541,7 +541,6 @@
# AS INCLUDE DEFDINED HERE
MCC_INCLUDE=-I$(NSROOT)/include \
-I$(NSCP_DISTDIR)/include \
- -I$(DBM_INCLUDE) \
-I$(NSPR_INCLUDE) \
-I$(SECURITY_INCLUDE) \
-I$(ICU_INCLUDE) \
@@ -682,29 +681,6 @@
NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
endif
-##############################
-# DBM
-#############################
-
-ifdef NSPR_SOURCE_ROOT
- DBM_LIBPATH = $(DBM_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
- DBM_INCLUDE = $(DBM_SOURCE_ROOT)/dist/public/dbm
-else
- DBM_LIBPATH = $(DBM_BUILD_DIR)/lib
- DBM_INCLUDE = $(DBM_BUILD_DIR)/include
-endif
-ifeq ($(ARCH), WINNT)
-DBM_LIBNAMES = dbm
-DBMOBJNAME = $(addsuffix .lib, $(DBM_LIBNAMES))
-LIBDBM = $(addprefix $(DBM_LIBPATH)/, $(DBMOBJNAME))
-else
-DBM_LIBNAMES = dbm
-DBM_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(addprefix lib, $(DBM_LIBNAMES)))
-DBMROBJNAME = $(addsuffix .a, $(addprefix lib, $(DBM_LIBNAMES)))
-LIBDBM = $(addprefix $(DBM_LIBPATH)/, $(DBMROBJNAME))
-DBMLINK = -L$(DBM_LIBPATH) $(addprefix -l, $(DBM_LIBNAMES))
-endif
-
#############################
# NSS
############################
Show replies by date