[Fedora-directory-commits] dsbuild ds.conf.mk, 1.1.1.1, 1.2 gar.lib.mk, 1.2, 1.3

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Sat Apr 8 19:26:52 UTC 2006


Author: rmeggins

Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild

Modified Files:
	ds.conf.mk gar.lib.mk 
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.



Index: ds.conf.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds.conf.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ds.conf.mk	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ ds.conf.mk	8 Apr 2006 19:26:49 -0000	1.2
@@ -4,3 +4,17 @@
 ifdef DSMLGWJAR_VERSION
 MASTER_SITES += http://directory.fedora.redhat.com/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/
 endif
+
+# cvs information
+# use USE_CVS=1 on the make command line to grab the sources from CVS
+# instead of from the checksummed source tarballs
+# fedora anon cvs
+FEDCVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+# mozilla anon cvs
+MOZCVSROOT=:pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot
+# default to fedora for now since the mozilla sources are more static
+CVSROOT=$(FEDCVSROOT)
+# default tag is HEAD
+CVSTAG=HEAD
+# each ds/*/Makefile must define the CVS modules e.g.
+#CVSMODULES=ldapserver


Index: gar.lib.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/gar.lib.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gar.lib.mk	28 Feb 2006 23:40:24 -0000	1.2
+++ gar.lib.mk	8 Apr 2006 19:26:49 -0000	1.3
@@ -32,14 +32,21 @@
 
 URLS = $(subst ://,//,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES))))
 
+# use NOCACHE with makesum - if we upload a new source tarball to the official download site, we want
+# to use that one to make the checksum, not the cached one
 ifdef NOCACHE
 	NOCACHEARG = "--header=Cache-Control: no-cache"
 endif
 
+# these are the flags to use with the cvs export command
+CVSFLAGS=-z3 -Q
+
 # Download the file if and only if it doesn't have a preexisting
 # checksum file.  Loop through available URLs and stop when you
 # get one that doesn't return an error code.
 $(DOWNLOADDIR)/%:
+# no download with cvs - we "extract" the files from CVS instead
+ifndef USE_CVS
 	@if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
 		echo " ==> Grabbing $(call TMSG_ID,$@)"; \
 		for i in $(filter %/$*,$(URLS)); do  \
@@ -52,6 +59,7 @@
 			false; \
 		fi; \
 	fi
+endif
 
 # download an http URL
 http//%:
@@ -88,11 +96,17 @@
 scp//%:
 	@scp -C $* $(DOWNLOADDIR)/
 
+# an svn url?
+# svn//%:
+#	@svn $(SVNFLAGS) export -r $(SVNTAG) -d $(GARNAME)-$(GARVERSION) svn://$*
+
 #################### CHECKSUM RULES ####################
 
 # check a given file's checksum against $(CHECKSUM_FILE) and
 # error out if it mentions the file without an "OK".
 checksum-%: $(CHECKSUM_FILE)
+# no checksum with cvs - we "extract" the files from CVS instead
+ifndef USE_CVS
 	@echo " ==> Running checksum on $(call TMSG_ID,$*)"
 	@if grep -- '$*' $(CHECKSUM_FILE); then \
 		if LC_ALL="C" LANG="C" $(MD5) -c $(CHECKSUM_FILE) 2>&1 | grep -- '$*' | grep -v ':[ ]\+OK'; then \
@@ -106,7 +120,7 @@
 		echo '*** GAR GAR GAR!  $(call TMSG_ID,$*) not in $(CHECKSUM_FILE) file!  GAR GAR GAR! ***' 1>&2; \
 		false; \
 	fi
-
+endif
 
 #################### EXTRACT RULES ####################
 
@@ -141,6 +155,11 @@
 	@cp $(DOWNLOADDIR)/$* $(WORKDIR)/
 	@$(MAKECOOKIE)
 
+extract-cvs:
+	@echo Doing CVS checkout of $(CVSMODULES) from $(CVSROOT) with tag $(CVSTAG)
+	@cd $(WORKDIR) ; cvs $(CVSFLAGS) export -r $(CVSTAG) -d $(GARNAME)-$(GARVERSION) $(CVSMODULES)
+	@$(MAKECOOKIE)
+
 ### EXTRACT FILE TYPE MAPPINGS ###
 # These rules specify which of the above extract action rules to use for a
 # given file extension.  Often support for a given extract type can be handled
@@ -206,7 +225,6 @@
 extract-%: cp-extract-%
 	@$(MAKECOOKIE)
 
-
 #################### PATCH RULES ####################
 
 # apply bzipped patches




More information about the Fedora-directory-commits mailing list