[Fedora-directory-commits] ldapserver/ldap Makefile, 1.11, 1.12 nsldap.mk, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap
Modified Files:
Makefile nsldap.mk
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name. These changes are
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.
For ldapserver, I had to change nsarch (adminserver changed nsarch in a
different way). I also got rid of the 32 bit specific setup stuff. I
assume this was due to 32 bit NES admin server, so we can get rid of
this for the future, because we will have all native 64 bit apps. I also
went ahead and rolled in the gcc4 changes since they are safe for gcc3
as well.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 22 Sep 2005 16:48:11 -0000 1.11
+++ Makefile 15 Feb 2006 22:53:51 -0000 1.12
@@ -62,16 +62,7 @@
cd systools; $(MAKE) $(MFLAGS) all
# new unix installer
ifeq ($(USE_SETUPUTIL), 1)
- # passing $(OBJDIR) as ORIGINAL_OBJDIR since USE_64 info is cleaned up
- # and lost in cm/newinst
- cd cm/newinst; $(MAKE) $(MFLAGS) ORIGINAL_OBJDIR=$(ABS_OBJDIR) 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
- # get copied into the 32-bit output directory by the makefile above. However, we later want to package them and expect
- # to see them in the 64-bit output directory. So, here we copy them over.
- $(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
+ cd cm/newinst; $(MAKE) $(MFLAGS) all
endif # USE_SETUPUTIL
else # not WINNT
ifeq ($(USE_SETUPUTIL), 1)
Index: nsldap.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsldap.mk 3 Oct 2005 19:53:46 -0000 1.10
+++ nsldap.mk 15 Feb 2006 22:53:51 -0000 1.11
@@ -1490,7 +1490,7 @@
#
# compiler to use, e.g. CC=cc or CC=gcc
-CC=/usr/bin/gcc -fwritable-strings
+CC=/usr/bin/gcc
# give full path to hostname since it may not be in user's path
HOSTNAME=/bin/hostname
18 years, 2 months
[Fedora-directory-commits] ldapserver buildpaths.mk, 1.10, 1.11 nsarch, 1.6, 1.7 nsconfig.mk, 1.17, 1.18
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver
Modified Files:
buildpaths.mk nsarch nsconfig.mk
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name. These changes are
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.
For ldapserver, I had to change nsarch (adminserver changed nsarch in a
different way). I also got rid of the 32 bit specific setup stuff. I
assume this was due to 32 bit NES admin server, so we can get rid of
this for the future, because we will have all native 64 bit apps. I also
went ahead and rolled in the gcc4 changes since they are safe for gcc3
as well.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildpaths.mk 10 Feb 2006 23:21:43 -0000 1.10
+++ buildpaths.mk 15 Feb 2006 22:53:45 -0000 1.11
@@ -71,10 +71,10 @@
# subdir of mozilla/dist, and their naming convention is different than
# ours - we need to map ours to theirs
ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
else
ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
else
MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
endif
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsarch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsarch 19 Apr 2005 22:06:42 -0000 1.6
+++ nsarch 15 Feb 2006 22:53:45 -0000 1.7
@@ -607,6 +607,16 @@
fi
ns_printf
exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_x86_64"; then
+ #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+ GNU_NAME="${UNAME_MACHINE}-unknown-linux"
+ NS_NAME="${UNAME_SYSTEM}"
+ NS_RELEASE="${UNAME_RELEASE}"
+ if echo "$NS_RELEASE" | grep >/dev/null 2>&1 "2.0."; then
+ NS_RELEASE="2.0"
+ fi
+ ns_printf
+ exit 0
elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
#echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout"
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nsconfig.mk 16 Nov 2005 03:31:05 -0000 1.17
+++ nsconfig.mk 15 Feb 2006 22:53:45 -0000 1.18
@@ -256,8 +256,10 @@
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_ARCH),Linux)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ NSOS_TEST1 = x86
+ endif
endif
ifeq ($(USE_LIBC),1)
@@ -273,8 +275,10 @@
NSCONFIG_NOTAG = $(NSCONFIG)
else
ifeq ($(NSOS_ARCH),RHEL)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ NSOS_TEST1 = x86
+ endif
endif
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
@@ -297,6 +301,8 @@
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
endif
endif
+ NSCONFIG += $(NS64TAG)
+ NSCONFIG_NOTAG += $(NS64TAG)
endif
endif
@@ -337,13 +343,9 @@
NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
endif
else
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
+ NSOBJDIR_NAME1 = $(NSOBJDIR_NAME)
endif
@@ -667,8 +669,8 @@
else
ifeq ($(ARCH), Linux)
OSVERSION := $(basename $(shell uname -r))
-CC=/usr/bin/gcc -fwritable-strings
-CXX=/usr/bin/g++ -fwritable-strings
+CC=/usr/bin/gcc
+CXX=/usr/bin/g++
CCC=$(CXX)
LD=$(CXX)
ARCH_DEBUG=-g
18 years, 2 months
[Fedora-directory-commits] adminserver buildpaths.mk, 1.5, 1.6 nsconfig.mk, 1.23, 1.24 nsdefs.mk, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/adminserver
Modified Files:
buildpaths.mk nsconfig.mk nsdefs.mk
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildpaths.mk 23 Nov 2005 01:25:45 -0000 1.5
+++ buildpaths.mk 15 Feb 2006 22:53:03 -0000 1.6
@@ -53,10 +53,10 @@
# subdir of mozilla/dist, and their naming convention is different than
# ours - we need to map ours to theirs
ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
else
ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
else
MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23
+++ nsconfig.mk 15 Feb 2006 22:53:03 -0000 1.24
@@ -47,9 +47,13 @@
NSOS_TEST1 := $(shell uname -m)
-ifeq (86, $(findstring 86, $(NSOS_TEST1)))
- CPU_ARCH := x86
-else
+ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86, $(findstring 86, $(NSOS_TEST1)))
+ CPU_ARCH := x86
+ else
+ CPU_ARCH := $(NSOS_TEST1)
+ endif
+else
CPU_ARCH := $(NSOS_TEST1)
endif
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9
+++ nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10
@@ -180,6 +180,9 @@
GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
endif
endif
+ NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)
+else
+ NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG)
endif
ifdef BUILD_INTL
18 years, 2 months
[Fedora-directory-commits] setuputil buildpaths.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.6, 1.7 nsdefs.mk, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578/setuputil
Modified Files:
buildpaths.mk nsconfig.mk nsdefs.mk
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- buildpaths.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ buildpaths.mk 15 Feb 2006 22:51:00 -0000 1.2
@@ -58,10 +58,10 @@
# subdir of mozilla/dist, and their naming convention is different than
# ours - we need to map ours to theirs
ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
else
ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
else
MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsconfig.mk 1 Feb 2006 22:46:18 -0000 1.6
+++ nsconfig.mk 15 Feb 2006 22:51:00 -0000 1.7
@@ -47,37 +47,21 @@
endif
ifeq ($(NSOS_ARCH),Linux)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
- NSOS_TMP := $(NSOS_TEST1)
- else
- NSOS_TMP := x86
- endif
- else
- NSOS_TMP := $(NSOS_TEST1)
- endif
ifeq ($(USE_LIBC),1)
LIBC_VERSION = _libc
else
LIBC_VERSION = _glibc
endif
PTHREAD_TAG = _PTH
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)$(LIBC_VERSION)$(PTHREAD_TAG)
NSCONFIG_NOTAG = $(NSCONFIG)
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
else
ifeq ($(NSOS_ARCH),RHEL)
- NSOS_TMP = $(NSOS_TEST1)
- ifeq (86,$(findstring 86,$(NSOS_TMP)))
- ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
- NSOS_TMP := $(NSOS_TEST1)
- else
- NSOS_TMP := x86
- endif
- endif
PTHREAD_TAG =
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)_$(GCC_VERSION)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
+ NSOBJDIR_NAME = $(NSCONFIG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ
else
ifeq ($(NSOS_TEST1),i86pc)
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
@@ -95,8 +79,8 @@
NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJD
endif
endif
+ NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ
endif
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ
endif
MAKE=gmake $(BUILDOPT) USE_PTHREADS=$(USE_PTHREADS) SECURITY=$(SECURITY) MOZILLA_SOURCE_ROOT_EXT=$(MOZILLA_SOURCE_ROOT_EXT)
@@ -509,18 +493,12 @@
NSOBJDIR_NAME = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
NSOBJDIR_NAME_32 = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
else
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
endif
NSOBJDIR_NAME1 = $(NSOBJDIR_NAME)
else
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
+ NSOBJDIR_NAME1 = $(NSOBJDIR_NAME)
endif
# platforms without full rtl debugging versions of libraries i.e. not NT
NSCP_DIST := $(ABS_ROOT_PARENT)/dist
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsdefs.mk 28 Jan 2006 02:33:14 -0000 1.5
+++ nsdefs.mk 15 Feb 2006 22:51:00 -0000 1.6
@@ -182,13 +182,15 @@
NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
endif
endif
+ NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)
+else
+ NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG)
endif
ifdef BUILD_INTL
INTL_DEF=-intl
endif
-NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG)
PLATFORM_DEST=$(NSOBJDIR_NAME)
PLATFORM_OBJDIR=$(ABS_ROOT)/built/$(PLATFORM_DEST)
PLATFORM_PACKAGE_DIR=$(ABS_ROOT)/built/package/$(PLATFORM_DEST)
18 years, 2 months
[Fedora-directory-commits] adminutil buildpaths.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27551/adminutil
Modified Files:
buildpaths.mk internal_comp_deps.mk nsconfig.mk
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- buildpaths.mk 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2
@@ -57,10 +57,10 @@
# subdir of mozilla/dist, and their naming convention is different than
# ours - we need to map ours to theirs
ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
else
ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
else
MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
endif
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- internal_comp_deps.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ internal_comp_deps.mk 15 Feb 2006 22:50:15 -0000 1.2
@@ -146,7 +146,7 @@
# LDAP does not have PTH version, so here is the hack which treat non PTH
# version as PTH version
ifeq ($(USE_PTHREADS), 1)
- LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME1)
+ LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME)
else
LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(LDAPOBJDIR)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nsconfig.mk 28 Jan 2006 02:29:52 -0000 1.7
+++ nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8
@@ -39,8 +39,12 @@
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_ARCH),Linux)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
+ NSOS_TEST1 = x86
+ endif
endif
ifeq ($(USE_LIBC),1)
@@ -56,12 +60,11 @@
NSCONFIG_NOTAG = $(NSCONFIG)
else
ifeq ($(NSOS_ARCH),RHEL)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
- endif
- ifeq ($(USE_64), 1)
- NSOS_TEST2 := $(NSOS_TEST1)$(NS64TAG)
- NSOS_TEST1 := $(NSOS_TEST2)
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
+ NSOS_TEST1 = x86
+ endif
endif
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
@@ -84,6 +87,9 @@
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
endif
endif
+# add _64 tag on all platforms except linux/rhel
+ NSCONFIG += $(NS64TAG)
+ NSCONFIG_NOTAG += $(NS64TAG)
endif
endif
@@ -469,17 +475,13 @@
NSOBJDIR_NAME = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
NSOBJDIR_NAME_32 = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
else
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
endif
else
- NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
- NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
+ NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ
endif
# platforms without full rtl debugging versions of libraries i.e. not NT
NSCP_DIST := $(ABS_ROOT_PARENT)/dist
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.4.2.2, 1.4.2.3 testdatainterop.c, 1.4.2.2, 1.4.2.3 testentry.c, 1.4.2.2, 1.4.2.3 testextendedop.c, 1.4.2.2, 1.4.2.3 testgetip.c, 1.4.2.2, 1.4.2.3 testpostop.c, 1.4.2.2, 1.4.2.3 testpreop.c, 1.4.2.3, 1.4.2.4 testsaslbind.c, 1.6.2.2, 1.6.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/servers/slapd/test-plugins
Modified Files:
Tag: Directory71RtmBranch
testbind.c testdatainterop.c testentry.c testextendedop.c
testgetip.c testpostop.c testpreop.c testsaslbind.c
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file
Index: testbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- testbind.c 31 Aug 2005 21:41:24 -0000 1.4.2.2
+++ testbind.c 15 Feb 2006 21:32:43 -0000 1.4.2.3
@@ -69,7 +69,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP2",
"sample bind pre-operation plugin" };
static Slapi_ComponentId *plugin_id = NULL;
Index: testdatainterop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- testdatainterop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2
+++ testdatainterop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3
@@ -113,7 +113,7 @@
/*
* Static variables.
*/
-static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP1",
+static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP2",
"sample pre-operation null suffix plugin" };
static Slapi_ComponentId *plugin_id = NULL;
Index: testentry.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- testentry.c 31 Aug 2005 21:41:24 -0000 1.4.2.2
+++ testentry.c 15 Feb 2006 21:32:43 -0000 1.4.2.3
@@ -90,7 +90,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP2",
"sample entry modification plugin" };
/* Entry store plug-in function */
Index: testextendedop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- testextendedop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2
+++ testextendedop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3
@@ -83,7 +83,7 @@
/* OID of the extended operation handled by this plug-in */
#define MY_OID "1.2.3.4"
-Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP2",
"sample extended operation plugin" };
Index: testgetip.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- testgetip.c 31 Aug 2005 21:41:24 -0000 1.4.2.2
+++ testgetip.c 15 Feb 2006 21:32:43 -0000 1.4.2.3
@@ -74,7 +74,7 @@
#include "slapi-plugin.h"
#include "nspr.h"
-Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP2",
"sample pre-operation plugin" };
static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen );
Index: testpostop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- testpostop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2
+++ testpostop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3
@@ -93,7 +93,7 @@
static char *changelogfile = "/tmp/changelog";
#endif
-Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP2",
"sample post-operation plugin" };
static void write_changelog( int optype, char *dn, void *change, int flag );
Index: testpreop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- testpreop.c 31 Aug 2005 21:41:24 -0000 1.4.2.3
+++ testpreop.c 15 Feb 2006 21:32:43 -0000 1.4.2.4
@@ -79,7 +79,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP2",
"sample pre-operation plugin" };
/* Pre-operation plug-in function */
Index: testsaslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- testsaslbind.c 31 Aug 2005 21:41:24 -0000 1.6.2.2
+++ testsaslbind.c 15 Feb 2006 21:32:43 -0000 1.6.2.3
@@ -80,7 +80,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP1",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP2",
"sample SASL bind pre-operation plugin" };
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/docs README.txt, 1.2.2.2, 1.2.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/docs
Modified Files:
Tag: Directory71RtmBranch
README.txt
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file
Index: README.txt
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- README.txt 12 Sep 2005 18:13:40 -0000 1.2.2.2
+++ README.txt 15 Feb 2006 21:32:38 -0000 1.2.2.3
@@ -1,5 +1,5 @@
=======================================================================
- Fedora Directory Server 7.1 SP1
+ Fedora Directory Server 7.1 SP2
=======================================================================
The Fedora Directory Server is subject to the terms detailed in the
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, 1.1.2.6, 1.1.2.7 slapd-patch.inf, 1.1.2.2, 1.1.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm/newinst
Modified Files:
Tag: Directory71RtmBranch
setup.patch slapd-patch.inf
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- setup.patch 17 Nov 2005 23:29:42 -0000 1.1.2.6
+++ setup.patch 15 Feb 2006 21:32:32 -0000 1.1.2.7
@@ -73,8 +73,12 @@
echo ""
echo "To accept the default shown in brackets, press the Enter key."
echo ""
-printf "Install location [/opt/fedora/servers]: "
+defaultserverroot=/opt/fedora-ds
+printf "Install location [$defaultserverroot]: "
read serverroot
+if [ "$serverroot" = "" ]; then
+ serverroot=$defaultserverroot
+fi
if [ ! -d $serverroot ]; then
echo ""
@@ -243,10 +247,10 @@
echo "ConfigDirectoryAdminID= $adminid" >> $inffile
echo "AdminDomain= $admindomain" >> $inffile
echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
-echo "Components= slapd-71sp1" >> $inffile
+echo "Components= slapd-71sp2" >> $inffile
echo "" >> $inffile
-echo "[slapd-71sp1]" >> $inffile
-echo "Components= slapd-71sp1" >> $inffile
+echo "[slapd-71sp2]" >> $inffile
+echo "Components= slapd-71sp2" >> $inffile
clear
Index: slapd-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd-patch.inf,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- slapd-patch.inf 16 Sep 2005 20:01:26 -0000 1.1.2.2
+++ slapd-patch.inf 15 Feb 2006 21:32:32 -0000 1.1.2.3
@@ -38,17 +38,17 @@
#
[General]
Name= %%%SERVER_NAME%%%
-Components=slapd-71sp1
+Components=slapd-71sp2
-[slapd-71sp1]
+[slapd-71sp2]
Name= %%%SERVER_NAME%%%
InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
Description= %%%SERVER_NAME%%%
-NickName= slapd-71sp1
+NickName= slapd-71sp2
Version= %%%SERVER_VERSION%%%
BuildNumber= %%%SERVER_BUILD_NUM%%%
-Archive= nsslapd-71sp1.zip
-SourcePath=slapd-71sp1
+Archive= nsslapd-71sp2.zip
+SourcePath=slapd-71sp2
PreInstall= ns-config -r
PostInstall= bin/slapd/admin/bin/ns-update
PreUninstall= bin/slapd/admin/bin/uninstall
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.12, 1.30.2.13 fedora-patch.inf, 1.1.2.6, 1.1.2.7 genRpmPatch.pl, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.6, 1.1.2.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf genRpmPatch.pl redhat-patch.inf
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.12
retrieving revision 1.30.2.13
diff -u -r1.30.2.12 -r1.30.2.13
--- Makefile 22 Oct 2005 07:00:03 -0000 1.30.2.12
+++ Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13
@@ -106,9 +106,9 @@
endif
ifdef USE_64
-VERSION=-ver 7.1SP1-64bit
+VERSION=-ver 7.1SP2-64bit
else
-VERSION=-ver 7.1SP1
+VERSION=-ver 7.1SP2
endif
ifeq ($(ARCH), HPUX)
@@ -191,9 +191,6 @@
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)
IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(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
@@ -235,7 +232,7 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
-SLAPDSP = slapd-71sp1
+SLAPDSP = slapd-71sp2
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -271,7 +268,7 @@
ifdef BUILD_RPM
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=7.1SP1
+ RPM_VERSION=7.1SP2
RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
@@ -655,21 +652,6 @@
endif
endif
-ifdef BUILD_PATCH
-# take care of files in components (e.g., a file in nsadmin.zip)
- -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
- zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
- afile=`echo $$pair | awk -F: '{print $$2}'` ; \
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
- done
-ifdef BUILD_RPM
-# create a patch
- $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
- mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
- ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
-endif
-endif
-
# 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
@@ -730,6 +712,26 @@
$(PERL) -w $(FIX_SETUP_INF) $(IMPORTADMINSRVNOTAR)/setup.inf setup.inf ; \
fi
+ifdef BUILD_PATCH
+# copying a file from the component area
+ -@for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \
+ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ dfile=`echo $$pair | awk -F: '{print $$3}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \
+ mkdir -p `dirname $$dfile`; cp $$sfile $$dfile ; \
+ echo $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \
+ $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \
+ done
+
+ifdef BUILD_RPM
+# create a patch
+ $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
+ mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
+ ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
+endif #BUILD_RPM
+endif #BUILD_PATCH
+
# we must remove the nsbase.zip file - we package those files now
rm -f $(INSTDIR)/base/nsbase.zip
# we also need to remove the Archive directive from the [base] section of the
@@ -831,6 +833,7 @@
# create a zip file based upon the $(PATCHINF) file
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
-@for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -842,6 +845,7 @@
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- fedora-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
+++ fedora-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7
@@ -36,17 +36,17 @@
# All rights reserved.
# END COPYRIGHT BLOCK
#
-# Info file to generate DS7.1 SP1 patch
+# Info file to generate DS7.1 SP2 patch
# base: <builddir> containing the base package -- DS7.1
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
#
-base: /share/dev4/fedora-ds/fds71/ships/20050526.1
+base: ...
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-file: 164834,165641,166229: bin/slapd/server/ns-slapd
-file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.*
+file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.*
file: 151678: bin/slapd/admin/bin/ds_newinst
file: 151678: bin/slapd/admin/bin/ds_create
file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.*
@@ -60,5 +60,26 @@
file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+file: M324525,M324529: shared/lib/libldap50.so
+file: M324525,M324529: shared/lib/libprldap50.so
+file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: bin/slapd/lib/libldap50.so
+file: M324525,M324529: bin/slapd/lib/libprldap50.so
+file: M324525,M324529: bin/slapd/lib/libssldap50.so
+file: M324525,M324529: clients/lib/libldap50.so
+file: M324525,M324529: clients/lib/libprldap50.so
+file: M324525,M324529: clients/lib/libssldap50.so
+file: M324525,M324529: shared/bin/ldapcmp
+file: M324525,M324529: shared/bin/ldapcompare
+file: M324525,M324529: shared/bin/ldapdelete
+file: M324525,M324529: shared/bin/ldapmodify
+file: M324525,M324529: shared/bin/ldapsearch
+
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: genRpmPatch.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- genRpmPatch.pl 22 Oct 2005 00:07:42 -0000 1.1.2.3
+++ genRpmPatch.pl 15 Feb 2006 21:32:27 -0000 1.1.2.4
@@ -129,16 +129,11 @@
$pos = rindex($l, ":", $pos);
$pos++;
$file = substr($l, $pos);
- $file =~ s/[ ]//g;
- push(@newfiles, ($file));
- } elsif ($l =~ /^compfile: /) {
- $pos = rindex($l, ":", $pos);
- $pos++;
- $file = substr($l, $pos);
- $file =~ s/[ ]//g;
+ $file =~ s/[ ]//g;
push(@newfiles, ($file));
}
}
+close(INFFILE);
if (1 == $verbose) {
print "Base: $basedir\n";
print "New Files:\n";
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- redhat-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
+++ redhat-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7
@@ -36,17 +36,17 @@
# All rights reserved.
# END COPYRIGHT BLOCK
#
-# Info file to generate DS7.1 SP1 patch
+# Info file to generate DS7.1 SP2 patch
# base: <builddir> containing the base package -- DS7.1
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
#
-base: /share/dev4/ds/ds71/ships/20050524.1
+base: /share/builds/products/server/directry/7.1
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-file: 164834,165641,166229: bin/slapd/server/ns-slapd
-file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.*
+file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.*
file: 151678: bin/slapd/admin/bin/ds_newinst
file: 151678: bin/slapd/admin/bin/ds_create
file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.*
@@ -60,5 +60,26 @@
file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+file: M324525,M324529: shared/lib/libldap50.so
+file: M324525,M324529: shared/lib/libprldap50.so
+file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: shared/bin/ldapcmp
+file: M324525,M324529: shared/bin/ldapcompare
+file: M324525,M324529: shared/bin/ldapdelete
+file: M324525,M324529: shared/bin/ldapmodify
+file: M324525,M324529: shared/bin/ldapsearch
+file: M324525,M324529: bin/slapd/lib/libldap50.so
+file: M324525,M324529: bin/slapd/lib/libprldap50.so
+file: M324525,M324529: bin/slapd/lib/libssldap50.so
+file: M324525,M324529: clients/lib/libldap50.so
+file: M324525,M324529: clients/lib/libprldap50.so
+file: M324525,M324529: clients/lib/libssldap50.so
+
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
18 years, 2 months
[Fedora-directory-commits] ldapserver/include version.h, 1.6.2.1, 1.6.2.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/include
Modified Files:
Tag: Directory71RtmBranch
version.h
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file
Index: version.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/version.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- version.h 31 Aug 2005 21:40:48 -0000 1.6.2.1
+++ version.h 15 Feb 2006 21:32:21 -0000 1.6.2.2
@@ -44,9 +44,9 @@
exist, the PRODUCT_VERSION define has _DEF appended.
*/
-#define DIRECTORY_VERSION_DEF "7.1 SP1"
+#define DIRECTORY_VERSION_DEF "7.1 SP2"
#define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP1"
+#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP2"
#define DS_VERSION_DEF DIRECTORY_VERSION_DEF
#define DS_VERSION_STRING DIRECTORY_VERSION_STRING
18 years, 2 months