[Fedora-directory-commits] ldapserver/ldap/cm/newinst ns-update, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/cm/newinst
Modified Files:
ns-update
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: ns-update
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ns-update 19 Apr 2005 22:07:20 -0000 1.6
+++ ns-update 3 Oct 2005 19:53:54 -0000 1.7
@@ -63,11 +63,13 @@
install_nsperl()
{
# the current version of nsPerl to use is defined in the slapd.inf
- nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d=`
- # run the nsperl installer
- $nsperlinst > setup/nsperl/install.log
- # use nsperl as our local copy of perl
- cp `dirname $nsperlinst`/nsperl $PERL
+ nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d= 2> /dev/null`
+ if [ "$nsperlinst" ]; then
+ # run the nsperl installer
+ $nsperlinst > setup/nsperl/install.log
+ # use nsperl as our local copy of perl
+ cp `dirname $nsperlinst`/nsperl $PERL
+ fi
}
wrap_security_tools()
@@ -176,13 +178,8 @@
cd `dirname $0`
rc=0
-if [ "$iDSISolaris" = "" ]; then
- ./ds_create $* $extraflags
- rc=$?
-else
- $PERL -w Install.pl $* $extraflags
- rc=$?
-fi
+./ds_create $* $extraflags
+rc=$?
if [ -f fix_secmod_db_64 ]; then
./fix_secmod_db_64 $sroot/alias $sroot/shared32/bin
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.33,1.34
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
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/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile 22 Sep 2005 16:48:16 -0000 1.33
+++ Makefile 3 Oct 2005 19:53:54 -0000 1.34
@@ -134,9 +134,6 @@
ifeq ($(BUILD_SECURITY), domestic)
SEC=-sec domestic
-ifdef FORTEZZA
-SEC=-sec fortezza
-endif
else
SEC=-sec export
endif
@@ -188,24 +185,13 @@
PACKAGE_STAGE_DIR=$(OBJDIR)/package
endif
-SHARETOP = $(COMPONENTS_DIR)/ldapsdk
-BUILD_DATE = $(shell date +%Y%m%d)
-SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR)
-#ADM_VERSDIR = admserv40
-#ADM_RELDATE = untested/19980119
-#IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-IMPORTADMINSRVNOTARBASE = $(COMPONENTS_DIR_DEV)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
# these are files and directories in the import adminsrv directory which we don't
# make a local copy of, we just import directly into the tar file or create a
# symlink to
-ADMIN_IMPORTS=base admin
+ADMIN_IMPORTS=$(ADMINSERVER_SUBCOMPS)
ADMIN_SERVER_TARGZ=adminserver.tar.gz
ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
-# Release directory for ldapsdk
-RELSDK = $(BUILD_DRIVE)$(RELTOP)/ldapsdk/$(OBJDIR_BASE)
-RELJDK = $(BUILD_DRIVE)$(RELTOP)/ldapjdk
-
# these are files we need to put in the command line/console only package
#LDAPSDK_IMPORTS=ldapsearch ldapdelete ldapmodify
@@ -290,8 +276,6 @@
endif
endif
-# Borland libraries are build on NT only
-
dummy:
-@echo SITEHACK = $(SITEHACK)
-@echo PACKAGE_SRC_DEST = $(PACKAGE_SRC_DEST)
@@ -350,17 +334,23 @@
# install the DSMLGW into the client directory
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
- $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/
+ if [ -d $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis ] ; then \
+ $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
-
# now time to move the necessary jars in place
$(INSTALL) -m 644 $(NSDIST)/classes/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(NSDIST)/classes/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
+# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
+# if so, I'm not sure where to get the implementation
+ if [ -f $(NSDIST)/classes/jaxrpc-api.jar ] ; then \
+ $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ fi
$(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
@@ -472,13 +462,15 @@
# install the ds jar file in the <server root>/$(DS_JAR_DEST_PATH) directory
# also install the other jar files we use
ifeq ($(USE_CONSOLE), 1)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ $(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ $(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ if [ -f $(NSDIST)/classes/$(CRIMSON_LICENSE) ] ; then \
+ $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ fi
endif
# Images for IM Presence plugin
@@ -513,8 +505,8 @@
endif
# Copy db tools
- $(INSTALL) -m 755 $(DB_BINPATH)/db_printlog* $(RELDIR)/bin/slapd/server
- $(INSTALL) -m 755 $(DB_BINPATH)/db_verify* $(RELDIR)/bin/slapd/server
+ $(INSTALL) -m 755 $(DB_BINPATH)/db_printlog$(EXE_SUFFIX) $(RELDIR)/bin/slapd/server
+ $(INSTALL) -m 755 $(DB_BINPATH)/db_verify$(EXE_SUFFIX) $(RELDIR)/bin/slapd/server
$(INSTALL) -m 755 $(OBJDIR)/lib/libsi18n/ns-slapd.properties $(RELDIR)/bin/slapd/property;
@@ -554,28 +546,13 @@
# For security reason, it's readable only by the owner
chmod 700 $(RELDIR)/bin/slapd/server
-# this is the rule to pull the Infozip utilities
-ifndef INFOZIP_PULL_METHOD
-INFOZIP_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/tools/infozip.zip:
- $(RM) $@
- $(FTP_PULL) -method $(INFOZIP_PULL_METHOD) \
- -objdir $(dir $@) \
- -componentdir $(COMPONENTS_DIR)/infozip/$(INFOZIP_RELDATE)/$(NSOBJDIR_NAME_32) \
- -files infozip.zip
- @if [ ! -f $@ ] ; \
- then echo "Error: could not get component INFOZIP file $@" ; \
- exit 1 ; \
- fi
-
# this is the rule to pull PerLDAP
ifndef PERLDAP_PULL_METHOD
PERLDAP_PULL_METHOD = FTP
endif
$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
+ifdef INTERNAL_BUILD
$(RM) $@
$(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
-objdir $(dir $@) \
@@ -586,6 +563,7 @@
exit 1 ; \
fi
$(PERL) -w fixPerlDAPInf.pl $(dir $(a))/perldap.inf
+endif
# this is the rule to pull nsPerl
ifndef NSPERL_PULL_METHOD
@@ -593,6 +571,7 @@
endif
$(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE):
+ifdef INTERNAL_BUILD
$(RM) $@
$(FTP_PULL) -method $(NSPERL_PULL_METHOD) \
-objdir $(dir $@) \
@@ -607,6 +586,7 @@
# conflicts with the one in perldap - bug 600138
# SITEHACK is defined in nsperl.mk
# $(ZIP) -d $(dir $@)/$(NSPERL_ZIP_FILE) lib/nsPerl5.6.1/$(SITEHACK)/Mozilla/LDAP/LDIF.pm
+endif
$(INSTDIR)/slapd:
$(MKDIR) -p $@
@@ -619,7 +599,6 @@
packageDirectory: $(INSTDIR)/slapd \
$(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
- $(INSTDIR)/tools/infozip.zip \
$(ADMSERV_DEP)
ifdef BUILD_PATCH
@@ -657,6 +636,7 @@
endif
endif
endif
+ifeq ($(USE_CONSOLE),1)
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
rm -f $(INSTDIR)/slapd/slapd-client.zip
@@ -668,7 +648,7 @@
# Normal way to ZIP the bits
cd $(RELDIR); $(ZIP) $(ZIP_FLAGS) $(ABS_INSTDIR)/slapd/slapd-client.zip ./java
endif
-
+endif # USE_CONSOLE
#; for file in $(LDAPSDK_IMPORTS) ; \
# do $(ZIP) $(ZIP_FLAGS) -g $(INSTDIR)/slapd/slapd-client.zip bin/slapd/server/$$file$(DOTEXE) ; \
# done
@@ -698,16 +678,14 @@
# if the untar directory is there, hooray; otherwise, we will have to unpack the
# binaries ourselves . . .
- curdir=`pwd`; cd $(INSTDIR) ; \
- if [ ! -d $(IMPORTADMINSRVNOTARBASE)/admin ] ; \
- then for file in $(ADMIN_IMPORTS_TARGZ) ; \
- do rm -rf $$file ; \
- $(GUNZIP) -c $(ADMSERV_DIR)/$$file | $(TAR) xvf - ; \
- done ; \
+ if [ ! -d $(ADMSERV_DIR)/admin ] ; \
+ then \
+ rm -rf $(addprefix $(INSTDIR)/,$(ADMINSERVER_SUBCOMPS)) ; \
+ $(GUNZIP) -c $(ADMSERV_DIR)/$(ADMIN_SERVER_TARGZ) | (cd $(INSTDIR) ; $(TAR) xvf - $(ADMINSERVER_SUBCOMPS)) ; \
else \
- for file in $(ADMIN_IMPORTS) ; \
- do rm -rf $$file ; \
- cp -r $(IMPORTADMINSRVNOTARBASE)/$$file $$file ; \
+ for file in $(ADMINSERVER_SUBCOMPS) ; \
+ do rm -rf $(INSTDIR)/$$file ; \
+ cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
done ; \
fi
@@ -715,7 +693,7 @@
rm -f $(INSTDIR)/base/nsbase.zip
# we also need to remove the Archive directive from the [base] section of the
# base.inf file
- $(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
+# $(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
# Install LDAP Readme and License files at root of Installation (dated pre-packaging) directory.
# And, replace the License.txt file that is packaged in nssvrcore.zip.
@@ -735,14 +713,14 @@
ifdef BUILD_SHIP
ifndef BUILD_PATCH
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
- perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ perldap dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
- perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ perldap dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
@@ -941,8 +919,8 @@
$(INSTDIR)/$(SLAPD_DIR)/slapd.z \
$(INSTDIR)/$(SLAPD_DIR)/dsjars.z
-$(INSTDIR)/$(SLAPD_DIR)/dsjars.z: $(CLASS_DEST)/$(LDAPCONSOLEJAR) \
- $(CLASS_DEST)/$(LDAPCONSOLEJAR_EN) $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE)
+$(INSTDIR)/$(SLAPD_DIR)/dsjars.z: $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) \
+ $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE)
rm -f $(DSJARS_ZIPFILE); cd $(RELDIR); zip -r $(DSJARS_ZIPFILE) java
$(INSTDIR)/$(SLAPD_DIR)/slapd.z:
@@ -974,7 +952,7 @@
_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
$(INSTDIR)/admin $(INSTDIR)/base \
- $(INSTDIR)/svrcore $(INSTDIR)/tools
+ $(INSTDIR)/svrcore
# see components.mk for a description of PACKAGE_SETUP_LIBS
-@for file in $(PACKAGE_SETUP_LIBS) ; \
do if [ -f $$file ] ; \
@@ -1004,20 +982,6 @@
$(INSTDIR)/svrcore: $(ADMSERV_DIR)/svrcore
cp -R $< $@
-$(INSTDIR)/tools: $(INSTDIR)/tools/infozip.zip
- $(UNZIP) -j $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/bin/perl$(DOTEXE) -d $@
- $(UNZIP) -j $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/bin/perl56.dll -d $@
-# We need to pull out the perl lib directory for perl to work
- mkdir $@/tmp
- $(UNZIP) $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/lib/\* -d $@/tmp
- cp -R $(a)/tmp/lib/nsPerl5.6.1/lib $@
- rm -rf $@/tmp
- $(UNZIP) -j $< -d $@
- rm -f $<
-
endif
$(OBJDIR)/lib/libsi18n/ns-slapd.properties:
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/clients/dsmlgw
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
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/clients/dsmlgw/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 19 Apr 2005 22:07:19 -0000 1.7
+++ Makefile 3 Oct 2005 19:53:53 -0000 1.8
@@ -46,7 +46,9 @@
include $(BUILD_ROOT)/ldap/javarules.mk
all: $(ANT_DEP) $(LDAPJDK_DEP)
- cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST)
+ @if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
+ cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
+ fi
$(ANT)
clean:
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsgw secglue.c, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/clients/dsgw
Modified Files:
secglue.c
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: secglue.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/secglue.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- secglue.c 19 Apr 2005 22:07:02 -0000 1.4
+++ secglue.c 3 Oct 2005 19:53:53 -0000 1.5
@@ -147,13 +147,6 @@
FUNC(CERT_IsExportVersion)
FUNC(CERT_PublicModulusLen)
-#ifdef FORTEZZA
-FUNC(SSL_EnableGroup)
-FUNC(SEC_OpenVolatileCertDB)
-FUNC(FortezzaConfigureServer)
-FUNC(SSL_IsEnabledGroup)
-#endif /* FORTEZZA */
-
/* DSGW pkennedy added, for HCL integration */
FUNC(BTOA_DataToAscii)
FUNC(ATOB_AsciiToData)
@@ -162,7 +155,6 @@
FUNC(PK11_GetTokenName)
FUNC(PK11_SetPasswordFunc)
FUNC(PK11_FindCertFromNickname)
-FUNC(PK11_FortezzaHasKEA)
FUNC(PK11_ConfigurePKCS11)
FUNC(SSL_SetPolicy)
FUNC(CERT_VerifyCertNow)
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/admin/src
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
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/admin/src/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 2 Sep 2005 20:40:48 -0000 1.12
+++ Makefile 3 Oct 2005 19:53:52 -0000 1.13
@@ -132,12 +132,6 @@
OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
else
ifeq ($(ARCH),HPUX)
-ifdef FORTEZZA
-# link with libci.a for FORTEZZA builds. On other platforms, libci.a is
-# linked into libds_admin.so, but not on HPUX
-EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER)
-EXTRA_LIBS += $(FORTEZZA_DRIVER)
-endif
ifeq ($(USE_64), 1)
EXTRALDFLAGS += +DA2.0W +DS2.0 +Z
endif
@@ -349,11 +343,7 @@
$(LDAP_SERVER_RELDIR)/latest_file.exe: $(OBJDEST)/latest_file.o
$(LINK_EXE_NOLIBSOBJS) $^
-installPerlFiles: $(BINDIR) $(BINDIR)/Install.pl
-
-$(BINDIR)/Install.pl: CreateInstall.pl $(PERL_SCRIPTS_DEST)
- -@$(RM) $@
- $(CP) $< $@
+installPerlFiles: $(BINDIR) $(PERL_SCRIPTS_DEST)
$(BINDIR)/%: %
-@$(RM) $@
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/admin/lib Makefile, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/admin/lib
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
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/admin/lib/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 19 Apr 2005 22:06:54 -0000 1.7
+++ Makefile 3 Oct 2005 19:53:47 -0000 1.8
@@ -64,9 +64,6 @@
OBJS = $(addprefix $(OBJDEST)/, $(subst .c,.o,$(SRCS)))
INCLUDES += -I$(LDAP_SRC)/admin/include
-ifdef FORTEZZA
-INCLUDES += -I$(BUILD_ROOT)/lib
-endif
EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
@@ -77,15 +74,6 @@
EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) $(LDAP_LIBLDIF_DEP)
#EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(LDAP_LIBLDIF) $(LDAP_SDK_LIBLDAP_DLL) \
# $(ADMINUTIL_LINK) $(SECURITYLINK) $(NSPRLINK)
-else # WINNT
-ifdef FORTEZZA
-# libci.a needs to be recompiled with the -Z option on HPUX, until then,
-# we'll link libci.a with the executables which need it -atom
-ifneq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER)
-EXTRA_LIBS += $(FORTEZZA_DRIVER)
-endif # !HPUX
-endif # FORTEZZA
endif # WINNT
ifeq ($(ARCH), Linux)
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap javarules.mk, 1.5, 1.6 nsldap.mk, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap
Modified Files:
javarules.mk nsldap.mk
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: javarules.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/javarules.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- javarules.mk 19 Apr 2005 22:06:52 -0000 1.5
+++ javarules.mk 3 Oct 2005 19:53:46 -0000 1.6
@@ -116,10 +116,7 @@
endif
endif
-CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)$(PATH_SEP)$(JSSJARFILE)
-#CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(SWINGJARFILE)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)
-
-RUNCLASSPATH:=$(JAVA_BUILD_DIR) $(PACKAGE_UNDER_JAVA)
+CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE)
ifndef JAVA
ifdef JAVABINDIR
@@ -145,6 +142,10 @@
endif
# How to run ant (the Java "make" system)
+ifdef GET_ANT_FROM_PATH
+ANT = ant
+else
ANT = $(JAVA) -Dant.home=$(ANT_HOME) -classpath "$(ANT_CP)$(PATH_SEP)$(JDKLIB)" org.apache.tools.ant.Main
+endif
##########################################################
Index: nsldap.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsldap.mk 10 May 2005 23:17:04 -0000 1.9
+++ nsldap.mk 3 Oct 2005 19:53:46 -0000 1.10
@@ -68,9 +68,9 @@
OBJDIR_BASE = $(notdir $(OBJDIR))
OBJDIR_BASE_32 = $(notdir $(OBJDIR_32))
# Release directory for Directory Server
-RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE)
-RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE_32)
-RELDIR_UNSTRIP = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(ARCHPROCESSOR)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-unstripped-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
+RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE)
+RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE_32)
+RELDIR_UNSTRIP = $(RELDIR)-unstripped
# this is the place libraries and plugins go which are used by other
# components i.e. not specific to slapd and its programs
@@ -384,9 +384,6 @@
#
LIBSEC_DEP = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
LIBSEC = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
-ifdef FORTEZZA
-LIBSEC += $(FORTEZZA_DRIVER)
-endif
#
# Libdb
18 years, 7 months
[Fedora-directory-commits] ldapserver/httpd/src unixso.mk,1.7,1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/httpd/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/httpd/src
Modified Files:
unixso.mk
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: unixso.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/httpd/src/unixso.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unixso.mk 10 May 2005 23:17:04 -0000 1.7
+++ unixso.mk 3 Oct 2005 19:53:41 -0000 1.8
@@ -107,9 +107,6 @@
#NSPRLINK = -L. -lnspr$(DLL_PRESUF)
#NSPRLINK = -L. -ldsnspr$(DLL_PRESUF)
ADM_EXTRA := -L. -L../../lib $(LDAPLINK) $(NSPRLINK) $(EXTRA_LIBS)
-ifdef FORTEZZA
-ADM_EXTRA += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX)
-endif
DEF_LIBPATH := .:../../lib:$(DEF_LIBPATH)
endif
@@ -160,22 +157,10 @@
LIBSEC1=$(LIBSECOBJS)
endif
-ifdef PRODUCT_IS_DIRECTORY_SERVER
- DAEMONLIB=
-else
- DAEMONLIB=$(OBJDIR)/lib/libhttpdaemon.a
-endif
-
-DEPLIBS = ${DAEMONLIB} $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP)
+DEPLIBS = $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP)
-ifdef FORTEZZA
-LIBSEC1 += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX)
-endif
-
-DEPLINK = ${DAEMONLIB} $(OBJDIR)/lib/libsi18n.a
-ifneq ($(BUILD_MODULE), HTTP_PERSONAL)
+DEPLINK = $(OBJDIR)/lib/libsi18n.a
DEPLINK += $(OBJDIR)/lib/libmsgdisp.a
-endif
DEPLINK += $(SOLINK) $(LDAPLINK) $(NSPRLINK) $(SOLINK2)
# Relative to the directory that contains the .so
18 years, 7 months
[Fedora-directory-commits] ldapserver/config config.mk,1.7,1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/config
Modified Files:
config.mk
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: config.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/config.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config.mk 19 Apr 2005 22:06:42 -0000 1.7
+++ config.mk 3 Oct 2005 19:53:40 -0000 1.8
@@ -422,10 +422,6 @@
DEFINES += -DJAVA
endif
-ifdef FORTEZZA
-DEFINES += -DFORTEZZA
-endif
-
######################################################################
GARBAGE = $(DEPENDENCIES) core
18 years, 7 months
[Fedora-directory-commits] ldapserver buildpaths.mk, 1.4, 1.5 component_versions.mk, 1.37, 1.38 components.mk, 1.31, 1.32 internal_buildpaths.mk, 1.5, 1.6 internal_comp_deps.mk, 1.26, 1.27 modules.awk, 1.6, 1.7 nsconfig.mk, 1.15, 1.16 nsdefs.mk, 1.13, 1.14
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver
Modified Files:
buildpaths.mk component_versions.mk components.mk
internal_buildpaths.mk internal_comp_deps.mk modules.awk
nsconfig.mk nsdefs.mk
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildpaths.mk 19 Apr 2005 22:06:41 -0000 1.4
+++ buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.5
@@ -115,3 +115,23 @@
NETSNMP_SOURCE_ROOT = $(BUILD_ROOT)/../net-snmp-5.2.1
#NETSNMP_BUILD_DIR = $(BUILD_ROOT)/../net-snmp
+
+ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
+#ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
+
+SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
+#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
+
+LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+
+ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
+
+LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/../directoryconsole
+
+# these are the files needed to build the java components - xmltools and dsmlgw -
+# and where to get them
+# Axis - axis.jar - http://ws.apache.org/axis/index.html - also jaxrpc.jar,saaj.jar
+# Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
+# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
+# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
+# Crimson - crimson.jar - http://xml.apache.org/crimson/
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- component_versions.mk 14 Sep 2005 01:06:59 -0000 1.37
+++ component_versions.mk 3 Oct 2005 19:53:40 -0000 1.38
@@ -103,14 +103,6 @@
ANT_COMP = ant
endif
-# Servlet SDK
-ifndef SERVLET_VERSION
- SERVLET_VERSION = 2.3
-endif
-ifndef SERVLET_COMP
- SERVLET_COMP = javax/servlet
-endif
-
# LDAP JDK
ifndef LDAPJDK_RELDATE
LDAPJDK_RELDATE = v4.17
@@ -208,14 +200,6 @@
AXIS_VERSION=1.2rc3
endif
-# JSP compiler jasper
-ifndef JSPC_VERSION
- JSPC_VERSION = 4.0.3
-endif
-ifndef JSPC_COMP
- JSPC_COMP = javax/jasper
-endif
-
# ICU
ifndef ICU_VERSDIR
ICU_VERSDIR=libicu_2_4
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- components.mk 2 Sep 2005 20:40:46 -0000 1.31
+++ components.mk 3 Oct 2005 19:53:40 -0000 1.32
@@ -483,6 +483,92 @@
### DB component (Berkeley DB) ############################
+
+###########################################
+# SETUPUTIL
+##########################################
+
+ifdef SETUPUTIL_SOURCE_ROOT
+ SETUPUTIL_LIBPATH = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/lib
+ SETUPUTIL_INCDIR = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/include
+ SETUPUTIL_BINPATH = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/bin
+else
+ SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
+ SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
+ SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
+endif
+SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
+
+ifeq ($(ARCH), WINNT)
+SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
+SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
+else
+SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
+SETUPUTIL_S_LINK = $(SETUPUTILLINK)
+endif
+
+# this is the base directory under which the component's files will be found
+# during the build process
+ifdef ADMINUTIL_SOURCE_ROOT
+ ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib
+ ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include
+else
+ ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
+ ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include
+endif
+
+PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
+LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
+LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(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)
+LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
+else
+ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
+endif
+ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \
+ -I$(ADMINUTIL_INCPATH)/libadmsslutil
+
+#########################################
+# LDAPJDK
+#########################################
+
+LDAPJDK = ldapjdk.jar
+ifdef LDAPJDK_SOURCE_DIR
+ LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
+else
+ LDAPJDK_DIR = $(CLASS_DEST)
+endif
+LDAPJARFILE=$(LDAPJDK_DIR)/ldapjdk.jar
+
+AXIS = axis-$(AXIS_VERSION).zip
+AXIS_FILES = $(AXIS)
+AXIS_FILE = $(CLASS_DEST)/$(AXIS)
+
+DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar
+DSMLJAR_FILE = $(CLASS_DEST)
+
+CRIMSON_LICENSE = LICENSE.crimson
+CRIMSONJAR = crimson.jar
+CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
+
+ifdef ADMINSERVER_SOURCE_ROOT
+ ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
+# else set in internal_buildpaths.mk
+endif
+# these are the only two subcomponents we use from the adminserver package
+ADMINSERVER_SUBCOMPS=admin base
+
+ifdef LDAPCONSOLE_SOURCE_ROOT
+ LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
+else
+ LDAPCONSOLE_DIR = $(CLASS_DEST)
+endif
+LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
+LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
+
# must define dependencies last because they depend on the definitions above
ifeq ($(INTERNAL_BUILD), 1)
include $(BUILD_ROOT)/internal_comp_deps.mk
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal_buildpaths.mk 19 Apr 2005 22:06:41 -0000 1.5
+++ internal_buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.6
@@ -125,3 +125,17 @@
db_component_name=$(DB_MAJOR_MINOR)
db_path_config :=$(NSCP_DISTDIR)/$(db_component_name)
endif # DB_SOURCE_ROOT
+
+#ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
+ifndef ADMINUTIL_SOURCE_ROOT
+ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
+endif # ADMINUTIL_SOURCE_ROOT
+
+#SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
+ifndef SETUPUTIL_SOURCE_ROOT
+SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
+endif # SETUPUTIL_SOURCE_ROOT
+
+ifndef ADMINSERVER_SOURCE_ROOT
+ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
+endif
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- internal_comp_deps.mk 6 Sep 2005 17:30:03 -0000 1.26
+++ internal_comp_deps.mk 3 Oct 2005 19:53:40 -0000 1.27
@@ -330,30 +330,12 @@
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
-ADMINUTIL_LIBPATH=$(ADMINUTIL_BUILD_DIR)/lib
-ADMINUTIL_INCPATH=$(ADMINUTIL_BUILD_DIR)/include
-
-PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
-LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
-LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
#
# Libadminutil
#
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)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
-else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
-endif
-ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) \
- -I$(ADMINUTIL_INCPATH)/libadminutil \
- -I$(ADMINUTIL_INCPATH)/libadmsslutil
ifndef ADMINUTIL_PULL_METHOD
ADMINUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -406,21 +388,13 @@
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)
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
SETUPUTIL_FILES = bin,lib,include
SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX)
-SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
-SETUPUTIL_S_LINK = $(SETUPUTILLINK)
endif
ifndef SETUPUTIL_PULL_METHOD
@@ -436,17 +410,14 @@
-@if [ ! -f $@ ] ; \
then echo "Error: could not get component SETUPUTIL file $@" ; \
fi
+
# apache-axis java classes #######################################
-AXIS = axis-$(AXIS_VERSION).zip
-AXIS_FILES = $(AXIS)
AXIS_RELEASE = $(COMPONENTS_DIR)/axis
#AXISJAR_DIR = $(AXISJAR_RELEASE)/$(AXISJAR_COMP)/$(AXISJAR_VERSION)
AXIS_DIR = $(AXIS_RELEASE)/$(AXIS_VERSION)
-AXIS_FILE = $(CLASS_DEST)/$(AXIS)
AXIS_DEP = $(AXIS_FILE)
AXIS_REL_DIR=$(subst -bin,,$(subst .zip,,$(AXIS)))
-
# This is java, so there is only one real platform subdirectory
#PACKAGE_UNDER_JAVA += $(AXIS_FILE)
@@ -461,21 +432,18 @@
$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-objdir $(CLASS_DEST) -componentdir $(AXIS_DIR) \
-files $(AXIS_FILES) -unzip $(CLASS_DEST)
-endif
+endifldap/
-@if [ ! -f $@ ] ; \
then echo "Error: could not get component AXIS files $@" ; \
fi
###########################################################
-
# other dsml java classes #######################################
-DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar
DSMLJAR_FILES = $(DSMLJAR)
DSMLJAR_RELEASE = $(COMPONENTS_DIR)
#DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION)
DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars
-DSMLJAR_FILE = $(CLASS_DEST)
DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar
ifndef DSMLJAR_PULL_METHOD
@@ -497,15 +465,11 @@
###########################################################
# XMLTOOLS java classes #######################################
-CRIMSONJAR = crimson.jar
-CRIMSON_LICENSE = LICENSE.crimson
CRIMSONJAR_FILES = $(CRIMSONJAR),$(CRIMSON_LICENSE)
CRIMSONJAR_RELEASE = $(COMPONENTS_DIR)
CRIMSONJAR_DIR = $(CRIMSONJAR_RELEASE)/$(CRIMSONJAR_COMP)/$(CRIMSONJAR_VERSION)
-CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
CRIMSONJAR_DEP = $(CRIMSONJAR_FILE) $(CLASS_DEST)/$(CRIMSON_LICENSE)
-
# This is java, so there is only one real platform subdirectory
PACKAGE_UNDER_JAVA += $(CRIMSONJAR_FILE)
@@ -516,7 +480,6 @@
$(CRIMSONJAR_DEP): $(CLASS_DEST)
ifdef COMPONENT_DEPS
- echo "Inside ftppull"
$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-objdir $(CLASS_DEST) -componentdir $(CRIMSONJAR_DIR) \
-files $(CRIMSONJAR_FILES)
@@ -529,6 +492,7 @@
# ANT java classes #######################################
ifeq ($(BUILD_JAVA_CODE),1)
+ifndef GET_ANT_FROM_PATH
# (we use ant for building some Java code)
ANTJAR = ant.jar
JAXPJAR = jaxp.jar
@@ -555,42 +519,14 @@
then echo "Error: could not get component ant files $@" ; \
fi
endif
-###########################################################
-
-# Servlet SDK classes #######################################
-SERVLETJAR = servlet.jar
-SERVLET_FILES = $(SERVLETJAR)
-SERVLET_RELEASE = $(COMPONENTS_DIR)
-SERVLET_DIR = $(SERVLET_RELEASE)/$(SERVLET_COMP)/$(SERVLET_VERSION)
-SERVLET_DEP = $(addprefix $(CLASS_DEST)/, $(SERVLET_FILES))
-SERVLET_CP = $(subst $(SPACE),$(PATH_SEP),$(SERVLET_DEP))
-SERVLET_PULL = $(subst $(SPACE),$(COMMA),$(SERVLET_FILES))
-
-ifndef SERVLET_PULL_METHOD
-SERVLET_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SERVLET_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
- echo "Inside ftppull"
- $(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(SERVLET_DIR) \
- -files $(SERVLET_PULL)
-endif
- -@if [ ! -f $@ ] ; \
- then echo "Error: could not get component servlet SDK files $@" ; \
- fi
-
+endif # GET_ANT_FROM_PATH
###########################################################
# LDAP java classes #######################################
-LDAPJDK = ldapjdk.jar
LDAPJDK_VERSION = $(LDAPJDK_RELDATE)
LDAPJDK_RELEASE = $(COMPONENTS_DIR)
-LDAPJDK_DIR = $(LDAPJDK_RELEASE)
LDAPJDK_IMPORT = $(LDAPJDK_RELEASE)/$(LDAPJDK_COMP)/$(LDAPJDK_VERSION)/$(NSOBJDIR_NAME)
# This is java, so there is only one real platform subdirectory
-LDAPJARFILE=$(CLASS_DEST)/ldapjdk.jar
LDAPJDK_DEP=$(LDAPJARFILE)
#PACKAGE_UNDER_JAVA += $(LDAPJARFILE)
@@ -612,23 +548,21 @@
###########################################################
# LDAP Console java classes
###########################################################
-LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
-LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
#LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/ldapconsole/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars
-LDAPCONSOLE_DEP = $(CLASS_DEST)/$(LDAPCONSOLEJAR)
+LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
ifndef LDAPCONSOLE_PULL_METHOD
LDAPCONSOLE_PULL_METHOD = $(COMPONENT_PULL_METHOD)
endif
-$(LDAPCONSOLE_DEP): $(CLASS_DEST)
+$(LDAPCONSOLE_DEP): $(LDAPCONSOLE_DIR)
ifdef COMPONENT_DEPS
$(FTP_PULL) -method $(LDAPCONSOLE_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(LDAPCONSOLE_JARDIR) \
+ -objdir $(LDAPCONSOLE_DIR) -componentdir $(LDAPCONSOLE_JARDIR) \
-files $(LDAPCONSOLE_FILES)
endif
-@if [ ! -f $@ ] ; \
@@ -643,79 +577,15 @@
PERLDAP_ZIP_FILE = perldap14.zip
###########################################################
-
-# JSS classes - for the Mission Control Console ######
-JSSJAR = jss$(JSS_JAR_VERSION).jar
-JSSJARFILE = $(CLASS_DEST)/$(JSSJAR)
-JSS_RELEASE = $(COMPONENTS_DIR)/$(JSS_COMP)/$(JSS_VERSION)
-JSS_DEP = $(JSSJARFILE)
-
-#PACKAGE_UNDER_JAVA += $(JSSJARFILE)
-
-ifndef JSS_PULL_METHOD
-JSS_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(JSS_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-ifdef VSFTPD_HACK
-# work around vsftpd -L problem
- $(FTP_PULL) -method $(JSS_PULL_METHOD) \
- -objdir $(CLASS_DEST)/jss -componentdir $(JSS_RELEASE) \
- -files xpclass.jar
- mv $(CLASS_DEST)/jss/xpclass.jar $(CLASS_DEST)/$(JSSJAR)
- rm -rf $(CLASS_DEST)/jss
-else
- $(FTP_PULL) -method $(JSS_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(JSS_RELEASE) \
- -files $(JSSJAR)
-endif
-endif
- -@if [ ! -f $@ ] ; \
- then echo "Error: could not get component JSS file $@" ; \
- fi
-
-###########################################################
-
-### JSP compiler package ##################################
-
-JSPC_REL = $(JSPC_VERSDIR)
-JSPC_REL_DATE = $(JSPC_VERSION)
-JSPC_FILES = jasper-compiler.jar jasper-runtime.jar
-JSPC_RELEASE = $(COMPONENTS_DIR)
-JSPC_DIR = $(JSPC_RELEASE)/$(JSPC_COMP)/$(JSPC_VERSION)
-JSPC_DEP = $(addprefix $(CLASS_DEST)/, $(JSPC_FILES))
-JSPC_CP = $(subst $(SPACE),$(PATH_SEP),$(JSPC_DEP))
-JSPC_PULL = $(subst $(SPACE),$(COMMA),$(JSPC_FILES))
-
-ifndef JSPC_PULL_METHOD
-JSPC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(JSPC_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
- echo "Inside ftppull"
- $(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(JSPC_DIR) \
- -files $(JSPC_PULL)
-endif
- -@if [ ! -f $@ ] ; \
- then echo "Error: could not get component jspc files $@" ; \
- fi
-
-###########################################################
-
-###########################################################
### Admin Server package ##################################
ADMIN_REL = $(ADM_VERSDIR)
ADMIN_REL_DATE = $(ADM_VERSION)
#ADMIN_FILE = adminserver.tar.gz
-ADMIN_FILE = admin,base
+ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
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)/adminserver
ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
ADM_VERSION = $(ADM_RELDATE)
@@ -728,8 +598,7 @@
ifndef ADMSERV_DEPS
ADMSERV_DEPS = $(COMPONENT_DEPS)
endif
-#IMPORTADMINSRV = /share/builds/sbsrel1/admsvr/admsvr62/ships/20030702.2/spd04_Solaris8/SunOS5.8-domestic-optimize-normal
-#ADM_RELEASE = /share/builds/sbsrel1/admsvr/admsvr62/ships/20030702.2/spd04_Solaris8/SunOS5.8-domestic-optimize-normal
+
$(ADMSERV_DEP): $(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)
ifdef ADMSERV_DEPS
$(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \
@@ -768,7 +637,6 @@
fi
### DOCS END #############################
-
# Windows sync component for Active Directory
ADSYNC = PassSync.msi
ADSYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync
Index: modules.awk
===================================================================
RCS file: /cvs/dirsec/ldapserver/modules.awk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modules.awk 19 Apr 2005 22:06:42 -0000 1.6
+++ modules.awk 3 Oct 2005 19:53:40 -0000 1.7
@@ -254,15 +254,6 @@
#DISTLIB libsec-$(WHICHA) $(MCOM_LIBDIR)/libsec libnspr libdbm libxp
#endif
-ifdef FORTEZZA
-ifeq ($(ARCH), WINNT)
-LIBSEC += $(MCOM_LIBDIR)/../dist/$(NSOBJDIR_NAME)/lib/tssp32.lib
-else
-FORTEZZA_DRIVER = $(MCOM_LIBDIR)/../dist/$(NSOBJDIR_NAME)/lib/libci.a
-endif
-LIBSEC += $(FORTEZZA_DRIVER)
-endif
-
ifneq ($(MODULE), LibNet)
LIBNET=$(MCOM_LIBDIR)/libnet/$(NSOBJDIR_NAME)/libnet.$(LIB_SUFFIX)
DISTLIB libnet.$(LIB_SUFFIX) $(MCOM_LIBDIR)/libnet
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsconfig.mk 2 Sep 2005 20:40:46 -0000 1.15
+++ nsconfig.mk 3 Oct 2005 19:53:40 -0000 1.16
@@ -67,22 +67,23 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+else
+ USE_ADMINSERVER:=1
+ USE_CONSOLE:=1
+ USE_DSMLGW:=1
+ USE_ORGCHART:=1
+ USE_DSGW:=1
+ USE_JAVATOOLS:=1
+ USE_SETUPUTIL:=1
endif
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/component_versions.mk
-# SEC_SUFFIX is the suffix to be applied to the reldate macro which specifies
-# the security of the specified release, either E for export, D for domestic,
-# or F for Fortezza
-ifdef FORTEZZA
- SEC_SUFFIX = F
+ifeq ($(SECURITY), domestic)
+ SEC_SUFFIX = D
else
- ifeq ($(SECURITY), domestic)
- SEC_SUFFIX = D
- else
- SEC_SUFFIX = E
- endif
+ SEC_SUFFIX = E
endif
PRETTY_ARCH := $(shell uname -s)
@@ -410,10 +411,6 @@
endif
endif
-ifdef FORTEZZA
- MCC_SERVER += -DFORTEZZA -DCLIENT_AUTH
-endif
-
MCC_SERVER += -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM)
# ----------- Default Flags, may be overridden below ------------
@@ -1360,22 +1357,10 @@
# XXXrobm The Sun MD stuff #includes stuff in the nspr dir without a prefix
# Otherwise the second NSCP_DISTDIR/include/nspr would not be necessary
-ifdef NSPR20
MCC_INCLUDE=-I$(BUILD_ROOT)/include \
- -I$(BUILD_ROOT)/include \
+ -I$(BUILD_ROOT)/include \
$(NSPR_INCLUDE) $(DBM_INCLUDE) $(SECURITY_INCLUDE) \
- $(SVRCORE_INCLUDE) \
- -I$(BUILD_ROOT)/nspr20/lib
-
-# $(SVRCORE_INCLUDE) $(NLS_INCLUDE) \
-
-else
-MCC_INCLUDE=-I$(BUILD_ROOT)/include \
- -I$(NSCP_DISTDIR)/include -I$(NSCP_DISTDIR)/include/nspr
-endif
-
-MCC_INCLUDE += -I$(LDAP_INCLUDE)
-MCC_INCLUDE += -I$(SASL_INCLUDE)
+ $(SVRCORE_INCLUDE) -I$(LDAP_INCLUDE) -I$(SASL_INCLUDE)
ifeq ($(ARCH), WINNT)
XP_FLAG=-DXP_WIN32 -DXP_WIN -D_WINDOWS -DXP_PC -DXP_WINNT
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nsdefs.mk 22 Sep 2005 16:48:10 -0000 1.13
+++ nsdefs.mk 3 Oct 2005 19:53:40 -0000 1.14
@@ -44,7 +44,7 @@
#
# BUILD_BOMB=[-DPUMPKIN_HOUR=xxxxxxx or just leave it empty]
# BUILD_DEBUG=[full, optimize, purify, quantify]
-# BUILD_MODULE=[HTTP_ADMIN, HTTP_PERSONAL, HTTP_ENTERPRISE, ...]
+# BUILD_MODULE=[HTTP_ADMIN, ...]
# BUILD_SECURITY=[none, export, domestic]
TMP_ARCH := $(shell uname -s)
@@ -125,22 +125,7 @@
NSPR_SUF=20
LDAP_SUF=50
-# We can't have lite fortezza ( I don't think it makes sense ).
-ifdef FORTEZZA
-BUILD_FORTEZZA=fortezza
-else
-ifdef LITE
-BUILD_FORTEZZA=lite
-else
-BUILD_FORTEZZA=normal
-endif
-endif
-
-ifdef LITE
-IS_DIR_LITE=true
-else
IS_DIR_LITE=false
-endif
# Foreign language support
WEBSERVER_LANGS = ja fr de
@@ -185,7 +170,6 @@
echo BUILD_MODULE=$(BUILD_MODULE)
echo BUILD_SECURITY=$(BUILD_SECURITY)
echo BUILD_DEBUG=$(BUILD_DEBUG)
-echo BUILD_FORTEZZA=$(BUILD_FORTEZZA)
echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS)
echo BUILD_BOMB=$(BUILD_BOMB)
echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION)
@@ -205,7 +189,6 @@
endif
SECURITY=$(BUILD_SECURITY)
DEBUG=$(BUILD_DEBUG)
-B_FORTEZZA=$(BUILD_FORTEZZA)
BOMB=$(BUILD_BOMB)
NSPR_THREADS=$(BUILD_NSPR_THREADS)
BUILD_DLL=$(BUILD_DLL_VERSION)
@@ -225,13 +208,8 @@
endif
endif
endif
-BASIC_OBJDIR=$(BUILD_ROOT)/built/$(ARCH)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)-$(DEBUG)$(RTSUFFIX)-$(B_FORTEZZA)
+BASIC_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
-#
-# -- Directory Server Section -----------------------------------------------
-#
-
-ifeq ($(BUILD_MODULE), DIRECTORY)
ifdef NSPR20
NSPR_DIR=nspr20
else
@@ -244,24 +222,13 @@
INSTANCE_NAME_PREFIX="Directory Server"
DIR=slapd
NS_PRODUCT=DIRECTORY_SERVER
-ARCHPROCESSOR=$(ARCH)
ifdef INCLUDE_SSL
SSL_PREFIX=-ssl
endif
-ifeq ($(findstring RHEL, $(BUILD_ARCH)), RHEL)
- NS_BUILD_FLAVOR = $(BUILD_ARCH)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
- ARCHPROCESSOR = $(BUILD_ARCH)
-else
- NS_BUILD_FLAVOR = $(ARCH)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
-endif
-NC_BUILD_FLAVOR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-ifeq ($(ARCH), WINNT)
-ifeq ($(PROCESSOR), ALPHA)
-ARCHPROCESSOR=$(ARCH)$(PROCESSOR)
-endif
-endif
-COMMON_OBJDIR=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
-COMMON_OBJDIR_32=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
+NS_BUILD_FLAVOR = $(FULL_RTL_OBJDIR)
+NC_BUILD_FLAVOR = $(FULL_RTL_OBJDIR)
+COMMON_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
+COMMON_OBJDIR_32= $(subst $(NS64TAG),,$(COMMON_OBJDIR))
OBJDIR=$(COMMON_OBJDIR)
OBJDIR_32=$(COMMON_OBJDIR_32)
DO_SEARCH=no
@@ -281,36 +248,6 @@
DIRVERDIR=$(COMMON_OBJDIR)/include
DIRVER_H=$(DIRVERDIR)/dirver.h
SDKVER_H=$(DIRVERDIR)/sdkver.h
-endif
-
-#
-# -- Default Section --------------------------------------------------------
-#
-# Some of the _OBJDIR is maintained for backward compatibility until they
-# are all cleaned up. Most of them heavily dependent on value of $(DIR)
-#
-
-ifndef AMDSERV_OBJDIR
-ADMSERV_OBJDIR=$(BASIC_OBJDIR)-admin
-endif
-
-ifndef COMMON_OBJDIR
-COMMON_OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef HTTPD_OBJDIR
-HTTPD_OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef MC_ICONS_OBJDIR
-MC_ICONS_OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef OBJDIR
-OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef PLUGINS_OBJDIR
-PLUGINS_OBJDIR=$(BASIC_OBJDIR)-$(DIR)/plugins
-endif
+# this is the one that adminutil, setuputil, and adminserver uses
+COMPONENT_OBJDIR=$(FULL_RTL_OBJDIR)
18 years, 7 months