[Fedora-directory-commits] ldapserver Makefile, 1.28, 1.29 internal_comp_deps.mk, 1.32, 1.33 nsdefs.mk, 1.15, 1.16

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5380/ldapserver

Modified Files:
	Makefile internal_comp_deps.mk nsdefs.mk 
Log Message:
Bug(s) fixed: 175053
Bug Description: The BUILD_BOMB is on by default
Reviewed by: Nathan (Thanks!)
Fix Description: Move the pumpkin and build bomb stuff into the internal makefiles.  If you want the build bomb on, you have to set BUILD_PUMPKIN=1 on the make command line.  The diff also contains some of the versioning for 1.0 to 1.0.1.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile	10 Nov 2005 01:35:45 -0000	1.28
+++ Makefile	7 Dec 2005 21:25:50 -0000	1.29
@@ -161,10 +161,6 @@
 
 consoleComponents: $(DS_CONSOLE_COMPONENT_DEP)
 
-pumpkin:
-	@echo NSOS_RELEASE is: $(NSOS_RELEASE)
-	$(PERL) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat
-
 buildnum:
 	if test ! -d $(BUILD_ARCH); then mkdir $(BUILD_ARCH); fi;
 	$(PERL) buildnum.pl -p $(BUILD_ARCH)
@@ -218,7 +214,7 @@
 
 buildAndPkgDirectory:	buildDirectory pkgDirectory
 
-buildDirectory: buildnum pumpkin $(OBJDIR) $(DIRVER_H) $(SDKVER_H) components 
+buildDirectory: buildnum $(PUMPKIN_TARGET) $(OBJDIR) $(DIRVER_H) $(SDKVER_H) components 
 	@echo 
 	@echo 
 	@echo ==== Starting LDAP Server ==========
@@ -357,6 +353,7 @@
 	-e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
 	-e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
 	-e 's/@GEN-VERSION@/1.0/g' \
+	-e 's/@NOSP-VERSION@/1.0.1/g' \
 	-e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
 	ldapserver.spec.tmpl > $@
 	mv $@ $(OBJDIR)


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- internal_comp_deps.mk	4 Nov 2005 02:45:20 -0000	1.32
+++ internal_comp_deps.mk	7 Dec 2005 21:25:50 -0000	1.33
@@ -45,6 +45,13 @@
 
 BUILD_MODE = ext
 
+ifdef BUILD_PUMPKIN
+PUMPKIN_AGE := 120
+#BUILD_BOMB=
+BUILD_BOMB=-DPUMPKIN_HOUR=$(shell cat $(BUILD_ROOT)/pumpkin.dat)
+BOMB=$(BUILD_BOMB)
+endif # BUILD_PUMPKIN
+
 ifndef NSPR_SOURCE_ROOT
 NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR)
 NSPR_DEP = $(NSPR_LIBPATH)/libnspr4.$(LIB_SUFFIX)
@@ -732,3 +739,11 @@
 	then echo "Error: could not get component NT4SYNC files $@" ; \
 	fi
 # Windows sync component for NT4
+
+# BUILD_BOMB stuff
+PUMPKIN_TARGET = pumpkin
+$(PUMPKIN_TARGET):
+ifdef BUILD_PUMPKIN
+	@echo NSOS_RELEASE is: $(NSOS_RELEASE)
+	$(PERL) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat
+endif # BUILD_PUMPKIN


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsdefs.mk	29 Oct 2005 02:25:50 -0000	1.15
+++ nsdefs.mk	7 Dec 2005 21:25:50 -0000	1.16
@@ -59,9 +59,6 @@
 
 USE_HCL=1
 
-PUMPKIN_AGE := 120
-#BUILD_BOMB=
-BUILD_BOMB=-DPUMPKIN_HOUR=$(shell cat $(BUILD_ROOT)/pumpkin.dat)
 BUILD_CHECKER=no
 ifndef BUILD_DEBUG
 BUILD_DEBUG=full
@@ -171,7 +168,6 @@
 echo BUILD_SECURITY=$(BUILD_SECURITY)
 echo BUILD_DEBUG=$(BUILD_DEBUG)
 echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS)
-echo BUILD_BOMB=$(BUILD_BOMB)
 echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION)
 echo BUILD_HTTPDLL_NAME=$(BUILD_HTTPDLL_NAME)
 echo BUILD_ADMIN_NAME=$(BUILD_ADMIN_NAME)
@@ -189,7 +185,6 @@
 endif
 SECURITY=$(BUILD_SECURITY)
 DEBUG=$(BUILD_DEBUG)
-BOMB=$(BUILD_BOMB)
 NSPR_THREADS=$(BUILD_NSPR_THREADS)
 BUILD_DLL=$(BUILD_DLL_VERSION)
 ADMINDLL_NAME=$(BUILD_ADMIN_NAME)
@@ -232,8 +227,8 @@
 OBJDIR=$(COMMON_OBJDIR)
 OBJDIR_32=$(COMMON_OBJDIR_32)
 DO_SEARCH=no
-DIR_VERSION:=1.0
-NOSP_DIR_VERSION:=1.0
+DIR_VERSION:=1.0.1
+NOSP_DIR_VERSION:=1.0.1
 DIR_NORM_VERSION:=1.0
 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must