[Fedora-directory-commits] adminserver Makefile, 1.17, 1.18 buildpaths.mk, 1.7, 1.8 components.mk, 1.41, 1.42 internal_buildpaths.mk, 1.3, 1.4 nsconfig.mk, 1.25, 1.26
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Tue Mar 21 18:33:45 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140
Modified Files:
Makefile buildpaths.mk components.mk internal_buildpaths.mk
nsconfig.mk
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile 18 Jan 2006 18:24:14 -0000 1.17
+++ Makefile 21 Mar 2006 18:33:37 -0000 1.18
@@ -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) $(ADMDOC) end_time
+nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildpaths.mk 17 Feb 2006 15:04:54 -0000 1.7
+++ buildpaths.mk 21 Mar 2006 18:33:37 -0000 1.8
@@ -81,6 +81,10 @@
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
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- components.mk 1 Feb 2006 23:03:41 -0000 1.41
+++ components.mk 21 Mar 2006 18:33:37 -0000 1.42
@@ -37,20 +37,24 @@
#Temporary integration area components
INT_NMCSDK = 1
-INT_ICU = 0
-INT_ADMINUTIL = 0
+INT_ICU = 1
+INT_ADMINUTIL = 1
INT_SETUPUTIL = 1
INT_LDAPSDK = 0
INT_ADMDOC = 0
+INT_MOD_ADMSERV = 1
+INT_MOD_RESTARTD = 1
+INT_MOD_NSS = 1
#To control external build vs. internal build
BUILD_MODE = ext
+ADMIN_BRAND = fedora
#############################################
# NSPR Library
############################################
-NSPR_RELDATE = v4.4.1
+NSPR_RELDATE = v4.6
NSPR_NSOBJDIR=$(NSOBJDIR_NAME)
@@ -106,7 +110,7 @@
# SECURITY LIBRARY
################################################
-SECURITY_RELDATE = NSS_3_9_3_RTM
+SECURITY_RELDATE = NSS_3_11_RTM
ifeq ($(INT_NSS), 1)
BASE_NSS = $(INT_DIR)/nss/$(SECURITY_RELDATE)
@@ -131,7 +135,7 @@
# ICU Library
#################################################
-ICU_RELDATE = libicu_2_4/20040820
+ICU_RELDATE = libicu_3_4
ICU_ROOT = $(NSCP_COMPDIR)/libicu
ICU_OBJDIR = $(NSOBJDIR_NAME)
@@ -158,7 +162,7 @@
# SETUPUTIL
##############################################################
-SETUPUTIL_RELDATE = 20051027
+SETUPUTIL_RELDATE = 20060307
SETUPUTIL_FILE = setuputil.tar.gz
SETUPUTIL_COMPNAME = setuputil/1.0
@@ -197,7 +201,7 @@
###############################################################
ADMINUTIL_SUF = 10
-ADMINUTIL_RELDATE = 20051026
+ADMINUTIL_RELDATE = 20060307
ADMINUTIL_VERSION = $(ADMINUTIL_RELDATE)
ADMINUTIL_ROOT = $(NSCP_COMPDIR)/adminutil
ADMINUTIL_COMPNAME = adminutil/1.0
@@ -267,7 +271,7 @@
# LDAP C SDK Library
#############################################################
-LDAP_RELDATE = v5.16
+LDAP_RELDATE = v5.17
LDAP_SUF = 50
LDAP_VERSION = $(LDAP_RELDATE)
@@ -280,9 +284,84 @@
$(LIBLDAP):
ifdef INTERNAL_BUILD
ifneq ($(ARCH), WINNT)
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(LDAPSDK_BUILD_DIR) -componentdir $(BASE_LDAPSDK) -files lib,tools,include
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(LDAPSDK_BUILD_DIR) -componentdir $(BASE_LDAPSDK) -files lib,bin,include
else
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(LDAPSDK_BUILD_DIR) -componentdir $(BASE_LDAPSDK) -files lib,tools,include
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(LDAPSDK_BUILD_DIR) -componentdir $(BASE_LDAPSDK) -files lib,bin,include
+endif
+else # INTERNAL_BUILD
+ @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
+endif
+
+#############################################################
+# MOD_ADMSERV
+#############################################################
+
+MOD_ADMSERV_RELDATE = 20060320
+MOD_ADMSERV_SUF = 1.0
+MOD_ADMSERV_VERSION = $(MOD_ADMSERV_RELDATE)
+
+ifeq ($(INT_MOD_ADMSERV), 1)
+BASE_MOD_ADMSERV = $(INT_DIR)/mod_admserv/$(MOD_ADMSERV_SUF)/$(MOD_ADMSERV_VERSION)/$(NSOBJDIR_NAME)
+else
+BASE_MOD_ADMSERV = $(COMPONENTS_DIR)/mod_admserv/$(MOD_ADMSERV_SUF)/$(MOD_ADMSERV_VERSION)/$(NSOBJDIR_NAME)
+endif
+
+$(MOD_ADMSERV):
+ifdef INTERNAL_BUILD
+ifneq ($(ARCH), WINNT)
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(MOD_ADMSERV_BUILD_DIR) -componentdir $(BASE_MOD_ADMSERV) -files lib
+else
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(MOD_ADMSERV_BUILD_DIR) -componentdir $(BASE_MOD_ADMSERV) -files lib
+endif
+else # INTERNAL_BUILD
+ @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
+endif
+
+#############################################################
+# MOD_RESTARTD
+#############################################################
+
+MOD_RESTARTD_RELDATE = 20060320
+MOD_RESTARTD_SUF = 1.0
+MOD_RESTARTD_VERSION = $(MOD_RESTARTD_RELDATE)
+
+ifeq ($(INT_MOD_RESTARTD), 1)
+BASE_MOD_RESTARTD = $(INT_DIR)/mod_restartd/$(MOD_RESTARTD_SUF)/$(MOD_RESTARTD_VERSION)/$(NSOBJDIR_NAME)
+else
+BASE_MOD_RESTARTD = $(COMPONENTS_DIR)/mod_restartd/$(MOD_RESTARTD_SUF)/$(MOD_RESTARTD_VERSION)/$(NSOBJDIR_NAME)
+endif
+
+$(MOD_RESTARTD):
+ifdef INTERNAL_BUILD
+ifneq ($(ARCH), WINNT)
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(MOD_RESTARTD_BUILD_DIR) -componentdir $(BASE_MOD_RESTARTD) -files lib
+else
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(MOD_RESTARTD_BUILD_DIR) -componentdir $(BASE_MOD_RESTARTD) -files lib
+endif
+else # INTERNAL_BUILD
+ @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
+endif
+
+#############################################################
+# MOD_NSS
+#############################################################
+
+MOD_NSS_RELDATE = 20060320
+MOD_NSS_SUF = 1.0
+MOD_NSS_VERSION = $(MOD_NSS_RELDATE)
+
+ifeq ($(INT_MOD_NSS), 1)
+BASE_MOD_NSS = $(INT_DIR)/mod_nss/$(MOD_NSS_SUF)/$(MOD_NSS_VERSION)/$(NSOBJDIR_NAME)
+else
+BASE_MOD_NSS = $(COMPONENTS_DIR)/mod_nss/$(MOD_NSS_SUF)/$(MOD_NSS_VERSION)/$(NSOBJDIR_NAME)
+endif
+
+$(MOD_NSS):
+ifdef INTERNAL_BUILD
+ifneq ($(ARCH), WINNT)
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(MOD_NSS_BUILD_DIR) -componentdir $(BASE_MOD_NSS) -files lib,bin
+else
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(MOD_NSS_BUILD_DIR) -componentdir $(BASE_MOD_NSS) -files lib,bin
endif
else # INTERNAL_BUILD
@if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
@@ -314,7 +393,7 @@
#############################################################
NMCJDK_SUF = 1.0
-NMCJDK_RELDATE = 20051027
+NMCJDK_RELDATE = 20060320
NMCJDK_COMP = console/$(NMCJDK_SUF)
@@ -330,7 +409,7 @@
BASE_NMCSDK = $(FED_COMPONENTS_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
endif
-NMCJDK_DIR = $(BASE_NMCSDK)/java
+NMCJDK_DIR = $(BASE_NMCSDK)/$(ADMIN_BRAND)-console-$(NMCJDK_SUF)
# since the jar files are packaged as is, they should not be symlink'ed.
NMCJDK_METHOD = FTP
@@ -339,19 +418,19 @@
ifdef INTERNAL_BUILD
mkdir -p $(CLASS_DEST)
# grab the jar files
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files fedora-base-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF)_en.jar,fedora-nmclf-$(NMCJDK_SUF).jar,fedora-nmclf-$(NMCJDK_SUF)_en.jar,caplugin
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR)/java -files $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar
# grab the startconsole program
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(BASE_NMCSDK) -files startconsole && chmod +x $(CLASS_DEST)/startconsole
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files startconsole && chmod +x $(CLASS_DEST)/startconsole
else # INTERNAL_BUILD
- @if [ ! -f $(CONSOLE_JAR_DIR)/fedora-base-1.0.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi
+ @if [ ! -f $(CONSOLE_JAR_DIR)/$(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi
endif
#############################################################
# JSS java classes
#############################################################
-JSS_SDK_VERSION = JSS_3_5_1_RTM
-JSSSDK = jss3.jar
+JSS_SDK_VERSION = JSS_3_7_RTM
+JSSSDK = jss37.jar
XPCLASS = $(JSS_JAR_NAME)
ifeq ($(INT_JSS), 1)
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- internal_buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.3
+++ internal_buildpaths.mk 21 Mar 2006 18:33:37 -0000 1.4
@@ -76,6 +76,21 @@
LDAPSDK_BUILD_DIR = $(NSCP_COMPDIR)/ldapsdk/$(NSOBJDIR_NAME)
endif # LDAPSDK_SOURCE_ROOT
+#MOD_ADMSERV_SOURCE_ROOT = $(BUILD_ROOT)/../mod_admserv
+ifndef MOD_ADMSERV_SOURCE_ROOT
+MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
+endif # MOD_ADMSERV_SOURCE_ROOT
+
+#MOD_RESTARTD_SOURCE_ROOT = $(BUILD_ROOT)/../mod_restartd
+ifndef MOD_RESTARTD_SOURCE_ROOT
+MOD_RESTARTD_BUILD_DIR = $(NSCP_COMPDIR)/mod_restartd/$(NSOBJDIR_NAME)
+endif # MOD_RESTARTD_SOURCE_ROOT
+
+#MOD_NSS_SOURCE_ROOT = $(BUILD_ROOT)/../mod_nss
+ifndef MOD_NSS_SOURCE_ROOT
+MOD_NSS_BUILD_DIR = $(NSCP_COMPDIR)/mod_nss/$(NSOBJDIR_NAME)
+endif # MOD_NSS_SOURCE_ROOT
+
#ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
ifndef ICU_SOURCE_ROOT
ICU_BUILD_DIR = $(NSCP_COMPDIR)/libicu/$(NSOBJDIR_NAME)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nsconfig.mk 24 Feb 2006 22:49:20 -0000 1.25
+++ nsconfig.mk 21 Mar 2006 18:33:37 -0000 1.26
@@ -530,7 +530,7 @@
endif
endif
-ADM_SUF=10
+ADM_SUF=1.0
# CLEAN THIS UP
@@ -728,16 +728,18 @@
# there are some platform specific versions as well
FREEBL_LIBS = freebl3
ifeq ($(USE_64), 1)
-ifeq ($(ARCH), SOLARIS)
-FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
-endif
+ ifeq ($(ARCH), SOLARIS)
+ FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
+ endif
else # USE_64
-ifeq ($(ARCH), SOLARIS)
-FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-endif # SOLARIS
-ifeq ($(ARCH), HPUX)
-FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
-endif # HPUX
+ ifeq ($(ARCH), SOLARIS)
+ FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+ endif # SOLARIS
+ ifeq ($(ARCH), HPUX)
+ ifneq ($(NSOS_TEST1), ia64) # PA-RISC only
+ FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
+ endif
+ endif # HPUX
endif # USE_64
# These files are only needed at runtime, not to link with
@@ -757,7 +759,7 @@
SECURITY_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(addprefix lib, $(SECURITY_LIBNAMES) $(SECURITY_EXTRA_RUNTIME_LIBNAMES)))
# and the .chk files
SECURITY_SOLIBS += $(addsuffix .chk, $(addprefix lib, $(SECURITY_NEED_CHK)))
-SECURITYOBJNAME = $(addsuffix .so, $(addprefix lib, $(SECURITY_LIBNAMES)))
+SECURITYOBJNAME = $(addsuffix .$(DLL_SUFFIX), $(addprefix lib, $(SECURITY_LIBNAMES)))
LIBSECURITY = $(addprefix $(SECURITY_LIBPATH)/, $(SECURITYOBJNAME))
SECURITYLINK = -L$(SECURITY_LIBPATH) $(addprefix -l, $(SECURITY_LIBNAMES))
endif
@@ -839,7 +841,7 @@
ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-$(ADMINUTIL_LIB_VERSION)
else
ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
- ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include
+ ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_LIB_VERSION)
endif
ifeq ($(ARCH), WINNT)
@@ -851,7 +853,7 @@
ADMINUTIL_LIBNAMES = admsslutil adminutil
ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF), $(addprefix lib, adminutil admsslutil))
ADMINUTIL_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMINUTIL_LIBNAMES)))
- ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX).$(MAJOR_VERSION), $(ADMINUTIL_SOLIB_NAMES))
+ ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX).$(ADMINUTIL_LIB_VERSION), $(ADMINUTIL_SOLIB_NAMES))
ADMINUTILOBJNAME = $(ADMINUTIL_SOLIBS)
LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_SOLIBS))
ADMINUTILLINK = -L$(ADMINUTIL_LIBPATH) $(addprefix -l, $(ADMINUTIL_LIBNAMES))
@@ -869,7 +871,7 @@
else
LDAPSDK_LIBPATH = $(LDAPSDK_BUILD_DIR)/lib
LDAPSDK_INCLUDE = $(LDAPSDK_BUILD_DIR)/include
- LDAPSDK_BINPATH = $(LDAPSDK_BUILD_DIR)/tools
+ LDAPSDK_BINPATH = $(LDAPSDK_BUILD_DIR)/bin
endif
ifeq ($(ARCH), WINNT)
@@ -887,6 +889,35 @@
LIBLDAP = $(addprefix $(LDAPSDK_LIBPATH)/, $(LDAPOBJNAME))
#########################################
+# MOD_ADMSERV, RESTARTD, NSS
+#########################################
+ifdef MOD_ADMSERV_SOURCE_ROOT
+ MOD_ADMSERV_LIBPATH = $(MOD_ADMSERV_SOURCE_ROOT)/.libs
+else
+ MOD_ADMSERV_LIBPATH = $(MOD_ADMSERV_BUILD_DIR)/lib
+endif
+ifdef MOD_RESTARTD_SOURCE_ROOT
+ MOD_RESTARTD_LIBPATH = $(MOD_RESTARTD_SOURCE_ROOT)/.libs
+else
+ MOD_RESTARTD_LIBPATH = $(MOD_RESTARTD_BUILD_DIR)/lib
+endif
+ifdef MOD_NSS_SOURCE_ROOT
+ MOD_NSS_LIBPATH = $(MOD_NSS_SOURCE_ROOT)/.libs
+ MOD_NSS_BINPATH = $(MOD_NSS_SOURCE_ROOT)
+else
+ MOD_NSS_LIBPATH = $(MOD_NSS_BUILD_DIR)/lib
+ MOD_NSS_BINPATH = $(MOD_NSS_BUILD_DIR)/bin
+endif
+
+MOD_ADMSERV_LIBNAME = libmodadmserv.$(DLL_SUFFIX)
+MOD_REATARTD_LIBNAME = libmodrestartd.$(DLL_SUFFIX)
+MOD_NSS_LIBNAME = libmodnss.$(DLL_SUFFIX)
+
+MOD_ADMSERV = $(addprefix $(MOD_ADMSERV_LIBPATH)/, $(MOD_ADMSERV_LIBNAME))
+MOD_RESTARTD = $(addprefix $(MOD_RESTARTD_LIBPATH)/, $(MOD_REATARTD_LIBNAME))
+MOD_NSS = $(addprefix $(MOD_NSS_LIBPATH)/, $(MOD_NSS_LIBNAME))
+
+#########################################
# NMCSDK
#########################################
More information about the Fedora-directory-commits
mailing list