[Fedora-directory-commits] ldapserver/ldap/cm/newinstnt Makefile, 1.6, 1.7 dsinst.c, 1.11, 1.12

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/cm/newinstnt

Modified Files:
	Makefile dsinst.c 
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/newinstnt/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	19 Apr 2005 22:07:21 -0000	1.6
+++ Makefile	2 Sep 2005 20:40:54 -0000	1.7
@@ -54,7 +54,7 @@
 
 OUTDIR=$(OBJDIR)/setup
 
-CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPSDK_INCLUDE) $(LDAPSDK_INCLUDE) \
+CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPUTIL_INCLUDE) $(LDAPSDK_INCLUDE) \
  /I "$(LDAP_SRC)/admin/include" /I "$(LDAP_SRC)/admin/lib" \
  /I "$(LDAP_SRC)/admin/src" /D \
  "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(OUTDIR)/dsinst.pch" /YX \
@@ -71,7 +71,7 @@
 	kernel32.lib user32.lib gdi32.lib comdlg32.lib\
 	comctl32.lib advapi32.lib shell32.lib uuid.lib\
 	wsock32.lib\
-	$(SETUPSDKLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
+	$(SETUPUTILLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
 
 DSOBJS= \
 	$(OUTDIR)/dsinst_dsalib_dn.obj \
@@ -92,7 +92,7 @@
 RM=erase /F /Q
 FIXINF= ../newinst/fixINF.pl
 
-all: $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf
+all: $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf
 
 clean:
 	-rm -rf "$(OUTDIR)"


Index: dsinst.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dsinst.c	19 Apr 2005 22:07:21 -0000	1.11
+++ dsinst.c	2 Sep 2005 20:40:54 -0000	1.12
@@ -7455,7 +7455,7 @@
     return FALSE;
   }
 
-  // hack to work around potential bug in setupsdk . . .
+  // hack to work around potential bug in setuputil . . .
   SetCurrentDirectory("../slapd");
   my_snprintf(infFile, sizeof(infFile), "slapd.inf");
   GetProductInfoStringWithTok(NSPERL_POST_INSTALL_PROG, "=", nsPerlPostInstall,