[Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.6, 1.7 ux-config.cc, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/cm/newinst
Modified Files:
Makefile ux-config.cc
Log Message:
Bug(s) fixed: 167453
Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin
Server open source candidate (using Apache, modules, etc), and the new
adminutil and setuputil components. The code has been changed to
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil)
and new versions of these components (7.1) and new /s/b/c disk layout
where applicable. We don't really get very much from the admin server
anymore, just the admin and base packages. All of the other setup stuff
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 19 Apr 2005 22:07:20 -0000 1.6
+++ Makefile 2 Sep 2005 20:40:54 -0000 1.7
@@ -57,8 +57,8 @@
include $(LDAP_SRC)/nsldap.mk
test:
- echo $(SETUPSDK_VERSION)
- echo $(SETUPSDK_RELEASE)
+ echo $(SETUPUTIL_VERSION)
+ echo $(SETUPUTIL_RELEASE)
# MODULE_CFLAGS = -DUSE_ADMSERV
@@ -98,12 +98,12 @@
INFO= $(OBJDIR)/$(DIR)
# Source for staged installation utilities
-INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
+INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
# ADM_VERSDIR = admserv40
# ADM_RELDATE = 19980112
-all: $(OBJDEST) $(BINDEST) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
+all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
# removed ns-keygen from build - it was only used for Dir Lite
# $(BINDEST)/ns-keygen
ifeq ($(ARCH), BSDI)
@@ -172,7 +172,7 @@
$(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
$(PURIFY) $(CXX) $(SHARED_FLAG) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
- -o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPSDKLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
+ -o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
$(EXTRA_LIBS) $(CURSES)
ifeq ($(ARCH), WINNT)
@@ -191,5 +191,5 @@
ns-config-gt: $(OBJS1GT)
$(PURIFY) $(CXX) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
- -o ns-config-gt $(OBJS1GT) $(SETUPSDKLINK) $(LIBLDAP) \
+ -o ns-config-gt $(OBJS1GT) $(SETUPUTILLINK) $(LIBLDAP) \
$(EXTRA_LIBS) $(CURSES)
Index: ux-config.cc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-config.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ux-config.cc 19 Apr 2005 22:07:21 -0000 1.8
+++ ux-config.cc 2 Sep 2005 20:40:54 -0000 1.9
@@ -206,11 +206,6 @@
if (installMode() != Silent)
{
-/* richm 20011005 - we can't do this until we get setupsdk46 - if ever
- if (iDSISolaris)
- Dialog::initDisplay("Directory", (const char *) NULL, "Configuration");
- else
-*/
Dialog::initDisplay("Directory");
}
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/admin/src DSAdmin.mk, 1.6, 1.7 Makefile, 1.11, 1.12 create_instance.c, 1.20, 1.21 ds_newinst.c, 1.3, 1.4 ds_remove_uninst.cpp, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/admin/src
Modified Files:
DSAdmin.mk Makefile create_instance.c ds_newinst.c
ds_remove_uninst.cpp
Log Message:
Bug(s) fixed: 167453
Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin
Server open source candidate (using Apache, modules, etc), and the new
adminutil and setuputil components. The code has been changed to
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil)
and new versions of these components (7.1) and new /s/b/c disk layout
where applicable. We don't really get very much from the admin server
anymore, just the admin and base packages. All of the other setup stuff
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: DSAdmin.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/DSAdmin.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSAdmin.mk 19 Apr 2005 22:06:54 -0000 1.6
+++ DSAdmin.mk 2 Sep 2005 20:40:48 -0000 1.7
@@ -62,7 +62,7 @@
EXTRALDFLAGS += $(SSLLIBFLAG)
endif
-EXTRA_LIBS += $(LIBPERL_A) $(SETUPSDK_S_LINK) $(LDAP_ADMLIB) \
+EXTRA_LIBS += $(LIBPERL_A) $(SETUPUTIL_S_LINK) $(LDAP_ADMLIB) \
$(LDAPLINK) $(DEPLINK) $(ADMINUTIL_LINK) \
$(NSPRLINK) $(NLSLINK) \
$(NLSLINK_CONV_STATIC)
@@ -102,7 +102,7 @@
OBJS= $(addprefix $(OBJDEST)/, $(DSADMIN_OBJS))
DSADMIN_SO = $(addprefix $(BINDIR)/, $(DSADMIN_BASENAME))
-EXTRA_LIBS_DEP = $(SETUPSDK_DEP)
+EXTRA_LIBS_DEP = $(SETUPUTIL_DEP)
# for Solaris, our most common unix build platform, we check for undefined
# symbols at link time so we don't catch them at run time. To do this, we
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 19 Apr 2005 22:06:55 -0000 1.11
+++ Makefile 2 Sep 2005 20:40:48 -0000 1.12
@@ -95,8 +95,8 @@
EXTRA_LIBS += $(ADMINUTIL_LINK)
endif
EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
-ifeq ($(USE_SETUPSDK), 1)
- EXTRA_LIBS += $(SETUPSDK_S_LINK)
+ifeq ($(USE_SETUPUTIL), 1)
+ EXTRA_LIBS += $(SETUPUTIL_S_LINK)
endif
EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS)
@@ -220,7 +220,7 @@
ifeq ($(ARCH), WINNT)
OBJECTS += namegen.o latest_file.o
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
OBJECTS += ds_remove_uninst.o
endif
endif
@@ -308,7 +308,7 @@
$(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/instindex.o \
$(OBJDEST)/create_instance.o $(OBJDEST)/cfg_sspt.o \
$(OBJDEST)/configure_instance.o $(OBJDEST)/script-gen.o \
- $(SETUPSDK_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
+ $(SETUPUTIL_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
$(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB)
# linking this file causes a .exp and a .lib file to be generated which don't seem
# to be required while running, so I get rid of them
@@ -317,10 +317,10 @@
$(BINDIR)/ds_remove: $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
$(LINK_EXE_NOLIBSOBJS) $(SHARED) $(EXTRALDFLAGS) \
$(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/init_ds_env.o \
- $(SETUPSDK_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
+ $(SETUPUTIL_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
$(BINDIR)/ds_remove.exe: $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
- $(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPSDK_S_LINK) $(NT_NOLIBS)
+ $(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPUTIL_S_LINK) $(NT_NOLIBS)
# linking this file causes a .exp and a .lib file to be generated which don't seem
# to be required while running, so I get rid of them
$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
@@ -330,9 +330,9 @@
$(OBJDEST)/%.o: %.cpp
ifeq ($(ARCH), WINNT)
- $(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@
+ $(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
else
- $(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@
+ $(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
endif
ifneq ($(ARCH), WINNT)
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- create_instance.c 26 Aug 2005 19:41:40 -0000 1.20
+++ create_instance.c 2 Sep 2005 20:40:48 -0000 1.21
@@ -1161,7 +1161,7 @@
" sleep 1;\n"
" else\n"
" PID=`cat $PIDFILE`\n"
- /* rbyrne: setupsdk takes any message here as an error:
+ /* rbyrne: setuputil takes any message here as an error:
" echo Server has been started. ns-slapd process started: $PID\n"*/
" exit 0;\n"
" fi\n"
@@ -1218,7 +1218,7 @@
" sleep 1;\n"
" else\n"
" PID=`cat $PIDFILE`\n"
- /* rbyrne: setupsdk takes any message here as an error:
+ /* rbyrne: setuputil takes any message here as an error:
" echo Server has been started. ns-slapd process started: $PID\n"*/
" exit 0;\n"
" fi\n"
@@ -1297,7 +1297,7 @@
" fi\n"
" else\n"
" PID=`cat $PIDFILE`\n"
- /* rbyrne: setupsdk takes any message here as an error:
+ /* rbyrne: setuputil takes any message here as an error:
" echo Server has been started. ns-slapd process started: $PID\n"*/
" exit 0;\n"
" fi\n"
@@ -1345,7 +1345,7 @@
" if test -f $PIDFILE ; then\n"
" rm -f $PIDFILE\n"
" fi\n"
- /* rbyrne: setupsdk takes any message here as an error:
+ /* rbyrne: setuputil takes any message here as an error:
" echo Server has been stopped. ns-slapd process stopped: $PID\n"*/
" exit 0\n"
" fi\n"
Index: ds_newinst.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds_newinst.c 19 Apr 2005 22:06:55 -0000 1.3
+++ ds_newinst.c 2 Sep 2005 20:40:48 -0000 1.4
@@ -37,7 +37,7 @@
/*
* ds_newinst.c - creates a new instance of directory server, scripts,
* configuration, etc. Does not create any Admin Server stuff or
- * deal with any setupsdk stuff, but may be optionally used to create
+ * deal with any setuputil stuff, but may be optionally used to create
* and configure the config suffix (o=NetscapeRoot)
*/
Index: ds_remove_uninst.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_remove_uninst.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ds_remove_uninst.cpp 19 Apr 2005 22:06:55 -0000 1.5
+++ ds_remove_uninst.cpp 2 Sep 2005 20:40:48 -0000 1.6
@@ -37,7 +37,7 @@
* END COPYRIGHT BLOCK **/
// ds_remove_uninst.cpp
//
-// ds_remove routines that use c++ calls in adminsdk
+// ds_remove routines that use c++ calls in adminutil
//
#include <iostream.h>
#include <fstream.h>
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap Makefile,1.9,1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 167453
Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin
Server open source candidate (using Apache, modules, etc), and the new
adminutil and setuputil components. The code has been changed to
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil)
and new versions of these components (7.1) and new /s/b/c disk layout
where applicable. We don't really get very much from the admin server
anymore, just the admin and base packages. All of the other setup stuff
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 9 May 2005 22:11:21 -0000 1.9
+++ Makefile 2 Sep 2005 20:40:47 -0000 1.10
@@ -61,7 +61,7 @@
ifneq ($(ARCH), WINNT)
cd systools; $(MAKE) $(MFLAGS) all
# new unix installer
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
cd cm/newinst; $(MAKE) $(MFLAGS) all
ifeq ($(USE_64),1)
# In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts
@@ -70,11 +70,11 @@
$(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR)
$(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR)
endif # USE_64
-endif # USE_SETUPSDK
+endif # USE_SETUPUTIL
else # not WINNT
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
cd cm/newinstnt; $(MAKE) $(MFLAGS) all
-endif # USE_SETUPSDK
+endif # USE_SETUPUTIL
endif # WINNT
cd admin; $(MAKE) $(MFLAGS) all
ifeq ($(ARCH), WINNT)
18 years, 7 months
[Fedora-directory-commits] ldapserver Makefile, 1.25, 1.26 component_versions.mk, 1.35, 1.36 components.mk, 1.30, 1.31 internal_comp_deps.mk, 1.24, 1.25 nsconfig.mk, 1.14, 1.15
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver
Modified Files:
Makefile component_versions.mk components.mk
internal_comp_deps.mk nsconfig.mk
Log Message:
Bug(s) fixed: 167453
Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin
Server open source candidate (using Apache, modules, etc), and the new
adminutil and setuputil components. The code has been changed to
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil)
and new versions of these components (7.1) and new /s/b/c disk layout
where applicable. We don't really get very much from the admin server
anymore, just the admin and base packages. All of the other setup stuff
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile 1 Sep 2005 01:11:19 -0000 1.25
+++ Makefile 2 Sep 2005 20:40:46 -0000 1.26
@@ -79,7 +79,7 @@
@echo " USE_ORGCHART=1 - build/bundle the Org Chart webapp"
@echo " USE_DSGW=1 - build/bundle the Phonebook/DS Gateway webapp"
@echo " USE_JAVATOOLS=1 - build/bundle the Java command line tools"
- @echo " USE_SETUPSDK=1 - build/bundle programs that use Setup SDK"
+ @echo " USE_SETUPUTIL=1 - build/bundle programs that use Setuputil"
###### Implementation notes:
#
@@ -131,7 +131,7 @@
ifeq ($(INTERNAL_BUILD), 1)
COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \
- $(ICU_DEP) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
+ $(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
$(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP)
endif
@@ -316,7 +316,7 @@
setupDirectory:
cd ldap/cm; $(MAKE) $(MFLAGS) releaseDirectory;
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
cd ldap/cm; $(MAKE) $(MFLAGS) packageDirectory;
endif
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- component_versions.mk 17 May 2005 02:09:34 -0000 1.35
+++ component_versions.mk 2 Sep 2005 20:40:46 -0000 1.36
@@ -122,10 +122,10 @@
# admin server
ifndef ADM_RELDATE
- ADM_RELDATE = 20050512
+ ADM_RELDATE = 20050901
endif
ifndef ADM_VERSDIR
- ADM_VERSDIR = adminserver/70$(BUILD_MODE)
+ ADM_VERSDIR = adminserver/7.1
endif
# Net-SNMP
@@ -133,16 +133,17 @@
NETSNMP_VER = v5.2.1
endif
-# setup sdk
-ifndef SETUP_SDK_RELDATE
- SETUP_SDK_RELDATE = 20050426
+# setuputil
+ifndef SETUPUTIL_RELDATE
+ SETUPUTIL_RELDATE = 20050831
endif
-ifndef SETUPSDK_VER
- SETUPSDK_VER = 70
+ifndef SETUPUTIL_VER
+ SETUPUTIL_VER = 71
+ SETUPUTIL_DOT_VER = 7.1
endif
-ifndef SETUPSDK_VERSDIR
- SETUPSDK_VERSDIR=setupsdk$(SETUPSDK_VER)$(BUILD_MODE)
+ifndef SETUPUTIL_VERSDIR
+ SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER)
endif
# infozip utilities
@@ -157,14 +158,15 @@
# admin utility library
ifndef ADMINUTIL_VER
- ADMINUTIL_VER=70
+ ADMINUTIL_VER=71
+ ADMINUTIL_DOT_VER=7.1
endif
ifndef ADMINUTIL_RELDATE
- ADMINUTIL_RELDATE=20050330
+ ADMINUTIL_RELDATE=20050721
endif
ifndef ADMINUTIL_VERSDIR
- ADMINUTIL_VERSDIR=adminsdk$(ADMINUTIL_VER)$(BUILD_MODE)
+ ADMINUTIL_VERSDIR=adminutil/$(ADMINUTIL_DOT_VER)
endif
# LDAP Console
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- components.mk 16 May 2005 21:58:00 -0000 1.30
+++ components.mk 2 Sep 2005 20:40:46 -0000 1.31
@@ -152,7 +152,7 @@
LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG)
LIBS_TO_PKG_SHARED += $(NSPR_LIBS_TO_PKG) # needed for cmd line tools
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
PACKAGE_SETUP_LIBS += $(NSPR_LIBS_TO_PKG)
endif
ifeq ($(USE_DSGW), 1)
@@ -237,7 +237,7 @@
SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_NEED_CHK)))
LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG)
endif
ifeq ($(USE_DSGW), 1)
@@ -318,7 +318,7 @@
LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
- ifeq ($(USE_SETUPSDK), 1)
+ ifeq ($(USE_SETUPUTIL), 1)
PACKAGE_SETUP_LIBS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
endif
ifeq ($(USE_DSGW), 1)
@@ -339,7 +339,7 @@
LIBS_TO_PKG += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
LIBS_TO_PKG_SHARED += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
- ifeq ($(USE_SETUPSDK), 1)
+ ifeq ($(USE_SETUPUTIL), 1)
PACKAGE_SETUP_LIBS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
endif
ifeq ($(USE_DSGW), 1)
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- internal_comp_deps.mk 18 May 2005 13:38:57 -0000 1.24
+++ internal_comp_deps.mk 2 Sep 2005 20:40:46 -0000 1.25
@@ -322,10 +322,14 @@
# ADMINUTIL library #######################################
ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE)
-ADMINUTIL_BASE=adminsdk/$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION}
-ADMSDKOBJDIR = $(FULL_RTL_OBJDIR)
-ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-#ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION}
+ifeq ($(BUILD_MODE), int)
+ ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+else
+ ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+# ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+endif
# this is the base directory under which the component's files will be found
# during the build process
ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
@@ -339,7 +343,7 @@
#
# Libadminutil
#
-ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
+ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
ifeq ($(ARCH), WINNT)
ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
@@ -376,7 +380,7 @@
ifndef NETSNMP_PULL_METHOD
NETSNMP_PULL_METHOD = $(COMPONENT_PULL_METHOD)
endif
-
+
$(NETSNMP_DEP): $(NSCP_DISTDIR_FULL_RTL)
ifneq ($(ARCH), WINNT)
ifdef COMPONENT_DEPS
@@ -392,41 +396,45 @@
###########################################################
-### SETUPSDK #############################
+### SETUPUTIL #############################
# this is where the build looks for setupsdk components
-SETUP_SDK_BUILD_DIR = $(NSCP_DISTDIR)/setupsdk
-SETUPSDK_VERSION = $(SETUP_SDK_RELDATE)
-SETUPSDK_RELEASE = $(COMPONENTS_DIR)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME)
-#SETUPSDK_RELEASE = $(COMPONENTS_DIR_DEV)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME)
-SETUPSDK_LIBPATH = $(SETUP_SDK_BUILD_DIR)/lib
-SETUPSDK_INCDIR = $(SETUP_SDK_BUILD_DIR)/include
-SETUPSDK_BINPATH = $(SETUP_SDK_BUILD_DIR)/bin
-SETUPSDK_INCLUDE = -I$(SETUPSDK_INCDIR)
+SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR)/setuputil
+SETUPUTIL_VERSION = $(SETUPUTIL_RELDATE)
+ifeq ($(BUILD_MODE), int)
+ SETUPUTIL_RELEASE = $(COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
+# SETUPUTIL_RELEASE = $(COMPONENTS_DIR_DEV)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
+else
+ SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
+endif
+SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
+SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
+SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
+SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
ifeq ($(ARCH), WINNT)
-SETUP_SDK_FILES = setupsdk.tar.gz -unzip $(NSCP_DISTDIR)/setupsdk
-SETUPSDK_DEP = $(SETUPSDK_LIBPATH)/nssetup32.$(LIB_SUFFIX)
-SETUPSDKLINK = /LIBPATH:$(SETUPSDK_LIBPATH) nssetup32.$(LIB_SUFFIX)
-SETUPSDK_S_LINK = /LIBPATH:$(SETUPSDK_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
+SETUPUTIL_FILES = setuputil.tar.gz -unzip $(NSCP_DISTDIR)/setuputil
+SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/nssetup32.$(LIB_SUFFIX)
+SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
+SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
else
-SETUP_SDK_FILES = bin,lib,include
-SETUPSDK_DEP = $(SETUPSDK_LIBPATH)/libinstall.$(LIB_SUFFIX)
-SETUPSDKLINK = -L$(SETUPSDK_LIBPATH) -linstall
-SETUPSDK_S_LINK = $(SETUPSDKLINK)
+SETUPUTIL_FILES = bin,lib,include
+SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX)
+SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
+SETUPUTIL_S_LINK = $(SETUPUTILLINK)
endif
-ifndef SETUPSDK_PULL_METHOD
-SETUPSDK_PULL_METHOD = $(COMPONENT_PULL_METHOD)
+ifndef SETUPUTIL_PULL_METHOD
+SETUPUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
endif
-$(SETUPSDK_DEP): $(NSCP_DISTDIR)
+$(SETUPUTIL_DEP): $(NSCP_DISTDIR)
ifdef COMPONENT_DEPS
- $(FTP_PULL) -method $(SETUPSDK_PULL_METHOD) \
- -objdir $(SETUP_SDK_BUILD_DIR) -componentdir $(SETUPSDK_RELEASE) \
- -files $(SETUP_SDK_FILES)
+ $(FTP_PULL) -method $(SETUPUTIL_PULL_METHOD) \
+ -objdir $(SETUPUTIL_BUILD_DIR) -componentdir $(SETUPUTIL_RELEASE) \
+ -files $(SETUPUTIL_FILES)
endif
-@if [ ! -f $@ ] ; \
- then echo "Error: could not get component SETUPSDK file $@" ; \
+ then echo "Error: could not get component SETUPUTIL file $@" ; \
fi
# apache-axis java classes #######################################
AXIS = axis-$(AXIS_VERSION).zip
@@ -702,28 +710,13 @@
ADMIN_REL = $(ADM_VERSDIR)
ADMIN_REL_DATE = $(ADM_VERSION)
-ADMIN_FILE = admserv.tar.gz
-ADMIN_FILE_TAR = admserv.tar
-ADMSDKOBJDIR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-IMPORTADMINSRV_BASE=$(COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
-#IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
+#ADMIN_FILE = adminserver.tar.gz
+ADMIN_FILE = admin,base
+ADMIN_FILE_TAR = adminserver.tar
+IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/admserv
-ADMSERV_DEP = $(ADMSERV_DIR)/setup$(EXE_SUFFIX)
-
-ifdef FORTEZZA
- ADM_VERSION = $(ADM_RELDATE)F
-else
- ifeq ($(SECURITY), domestic)
- ADM_VERSION = $(ADM_RELDATE)D
- else
- ifneq ($(ARCH), IRIX)
- ADM_VERSION = $(ADM_RELDATE)E
- else
- ADM_VERSION = $(ADM_RELDATE)D
- endif
- endif
-endif
+ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
+ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
ADM_VERSION = $(ADM_RELDATE)
ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
@@ -741,7 +734,7 @@
ifdef ADMSERV_DEPS
$(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \
-objdir $(ADMSERV_DIR) -componentdir $(IMPORTADMINSRV) \
- -files $(ADMIN_FILE) -unzip $(ADMSERV_DIR)
+ -files $(ADMIN_FILE)
endif
@if [ ! -f $@ ] ; \
then echo "Error: could not get component ADMINSERV file $@" ; \
@@ -755,7 +748,7 @@
DSDOC_VERSDIR = $(DIR_NORM_VERSION)$(BUILD_MODE)
#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
-
+
DSDOC_CLIENTS = slapd_clients.zip
DSDOC_COPYRIGHT = slapd_copyright.zip
DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nsconfig.mk 10 May 2005 23:16:59 -0000 1.14
+++ nsconfig.mk 2 Sep 2005 20:40:46 -0000 1.15
@@ -66,7 +66,7 @@
USE_ORGCHART:=1
USE_DSGW:=1
USE_JAVATOOLS:=1
- USE_SETUPSDK:=1
+ USE_SETUPUTIL:=1
endif
include $(BUILD_ROOT)/nsdefs.mk
@@ -373,14 +373,15 @@
COMPONENTS_DIR_DEV = /share/builds/sbsintegration
endif
+# internal repository for all pre-built RTM components, including Red Hat branded ones
ifndef COMPONENTS_DIR
COMPONENTS_DIR = /share/builds/components
endif
-# For now, we need to pick up a private build of the LDAP SDK
-#ifndef LDAP_SBC
-#LDAP_SBC = /share/builds/sbsintegration/ds/ds70-bozeman
-#endif
+# internal repository for pre-built RTM Fedora branded components
+ifndef FED_COMPONENTS_DIR
+FED_COMPONENTS_DIR = /fedora/components
+endif
###########################################################
@@ -1303,7 +1304,7 @@
NSCP_ABS_DISTDIR_FULL_RTL = $(ABS_ROOT_PARENT)/dist/$(FULL_RTL_OBJDIR)
# these components may have additional RTL debugging support built in on NT
-# adminsdk (adminutil), dbm, ldapsdk, NLS, NSPR, NSS (security)
+# adminutil, dbm, ldapsdk, NLS, NSPR, NSS (security)
# we cannot simply redefine NSOBJDIR_NAME and NSCP_DISTDIR because other
# components do not have this RTL support stuff and the .OBJD directory
# does not exist
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinstnt dsinst.rc, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27953/ldap/cm/newinstnt
Modified Files:
dsinst.rc
Log Message:
[167264] Update branding script data to include the revision info
1) Makefile: Added debrandDirectory target for debranding
2) nsdefs.mk: Introduced a new macro NOSP_DIR_VERSION.
Index: dsinst.rc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dsinst.rc 19 Apr 2005 22:07:21 -0000 1.6
+++ dsinst.rc 1 Sep 2005 01:11:20 -0000 1.7
@@ -190,7 +190,7 @@
IDD_SUITESPOTID DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION
-"Directory Server 7.0 Fedora configuration directory server administrator "
+"Directory Server 7.1 Fedora configuration directory server administrator "
FONT 8, "MS Sans Serif"
BEGIN
@@ -489,7 +489,7 @@
IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION
-"Directory Server 7.0 Fedora configuration directory server administrator "
+"Directory Server 7.1 Fedora configuration directory server administrator "
FONT 8, "MS Sans Serif"
BEGIN
18 years, 8 months
[Fedora-directory-commits] ldapserver Makefile, 1.24, 1.25 nsdefs.mk, 1.11, 1.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27953
Modified Files:
Makefile nsdefs.mk
Log Message:
[167264] Update branding script data to include the revision info
1) Makefile: Added debrandDirectory target for debranding
2) nsdefs.mk: Introduced a new macro NOSP_DIR_VERSION.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile 16 May 2005 03:10:04 -0000 1.24
+++ Makefile 1 Sep 2005 01:11:19 -0000 1.25
@@ -206,9 +206,14 @@
$(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
@echo ==== Finished Branding LDAP Server ==========
+debrandDirectory: $(RELTOOLSPATH)/brandver.pl
+ @echo ==== Debranding LDAP Server ==========
+ $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
+ @echo ==== Finished Debranding LDAP Server ==========
+
normalizeDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Normalizing LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/rhds/normalize.dat -s redhat-ds.spec
+ $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
@echo ==== Normalizing Branding LDAP Server ==========
buildAndPkgDirectory: buildDirectory pkgDirectory
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nsdefs.mk 19 Apr 2005 22:06:42 -0000 1.11
+++ nsdefs.mk 1 Sep 2005 01:11:19 -0000 1.12
@@ -265,6 +265,7 @@
OBJDIR_32=$(COMMON_OBJDIR_32)
DO_SEARCH=no
DIR_VERSION:=7.1
+NOSP_DIR_VERSION:=7.1
DIR_NORM_VERSION:=7.1
# When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
# update all of the .exp and .def files by executing the following command:
18 years, 8 months