typo in BootstrapFS dependency

[build.git] / Rules.mk

diff --git a/Rules.mk b/Rules.mk
index 4e24727..03341cf 100644 (file)
--- a/Rules.mk
+++ b/Rules.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: Rules.mk,v 1.23.2.1 2006/07/24 19:33:13 mlhuang Exp $
+# $Id: Rules.mk,v 1.37 2007/09/10 22:24:20 mef Exp $
 #
 
 # Base rpmbuild in the current directory
@@ -16,6 +16,13 @@ export CVSROOT CVS_RSH
 #
 
 SPECFILE := SPECS/$(notdir $(SPEC))
+MULTI_MODULE := $(word 2,$(MODULE))
+# is there a single module ? to mimick cvs export -d behaviour
+ifeq "$(MULTI_MODULE)" ""
+       _MAINMODULE := $(MODULE)
+else
+       _MAINMODULE := $(firstword $(MODULE))
+endif 
 
 $(SPECFILE):
        mkdir -p SPECS
@@ -27,7 +34,13 @@ else
         # Define cvstag for tagged builds
        echo "%define cvstag $(TAG)" >> $@
 endif
-       cvs -d $(CVSROOT) checkout -r $(TAG) -p $(SPEC) >> $@
+       $(if $($(package)-CVSROOT), cvs -d $($(package)-CVSROOT) checkout -r $(TAG) -p $(_MAINMODULE)/$(SPEC) >> $@; ,\
+         $(if $($(package)-SVNPATH), svn cat $($(package)-SVNPATH)/$(_MAINMODULE)/$(TAG)/$(SPEC) >> $@; ,\
+           $(if $(CVSROOT), cvs -d $(CVSROOT) checkout -r $(TAG) -p $(_MAINMODULE)/$(SPEC) >> $@; ,\
+             $(if $(SVNPATH), svn cat $(SVNPATH)/$(_MAINMODULE)/$(TAG)/$(SPEC) >> $@; ) \
+            )\
+          )\
+        )
 
 #
 # Parse spec file into Makefile fragment
@@ -35,13 +48,13 @@ endif
 
 MK := tmp/$(package).mk
 
-parseSpec: CFLAGS := -g -Wall
+parseSpec: CFLAGS := -g -Wall -D_GNU_SOURCE
 
 parseSpec: LDFLAGS := -lrpm -lrpmbuild
 
 $(MK): $(SPECFILE) parseSpec .rpmmacros
        mkdir -p tmp
-       ./parseSpec $(SPECFILE) > $@
+       ./parseSpec $(RPMFLAGS) $(SPECFILE) > $@
 
 # Defines SOURCES, SRPM, RPMS
 include $(MK)
@@ -60,9 +73,38 @@ $(patsubst %.tar,%,$(1))))))
 
 SOURCEDIRS := $(call stripext,$(SOURCES))
 
+# Thierry - Jan 29 2007
+# Allow different modules to have  different CVSROOT
+# and/or to be extracted from their SVNPATH
+#
+# is there a single module ? to mimick cvs export -d behaviour
+ifeq "$(MULTI_MODULE)" ""
+# single module: do as before
+SOURCES/$(package):
+       mkdir -p SOURCES && cd SOURCES && \
+        (\
+        $(if $($(package)-CVSROOT), cvs -d $($(package)-CVSROOT) export -r $(TAG) -d $(package) $(MODULE); ,\
+          $(if $($(package)-SVNPATH), svn export $($(package)-SVNPATH)/$(MODULE)/$(TAG) $(package) ; ,\
+            $(if $(CVSROOT), cvs -d $(CVSROOT) export -r $(TAG) -d $(package) $(MODULE); ,\
+              $(if $(SVNPATH), svn export $(SVNPATH)/$(MODULE)/$(TAG) $(package) ;) \
+             )\
+           )\
+         )\
+        )
+else
+# multiple modules : iterate 
 SOURCES/$(package):
-       mkdir -p SOURCES
-       cd SOURCES && cvs -d $(CVSROOT) export -r $(TAG) -d $(package) $(MODULE)
+       mkdir -p SOURCES/$(package) && cd SOURCES/$(package) && \
+        $(foreach module,$(MODULE),\
+          $(if $($(module)-CVSROOT), cvs -d $($(module)-CVSROOT) export -r $(TAG) -d $(module) $(module); ,\
+            $(if $($(module)-SVNPATH), svn export $($(module)-SVNPATH)/$(module)/$(TAG) $(module) ; ,\
+              $(if $(CVSROOT), cvs -d $(CVSROOT) export -r $(TAG) -d $(module) $(module); ,\
+                $(if $(SVNPATH), svn export $(SVNPATH)/$(module)/$(TAG) $(module) ;) \
+               )\
+             )\
+           )\
+         )
+endif
 
 # Make a hard-linked copy of the exported directory for each Source
 # defined in the spec file. However, our convention is that there
@@ -97,7 +139,7 @@ SOURCES/%.tar: SOURCES/%
 all: $(RPMS) $(SRPM)
 
 # Build RPMS
-$(RPMS): $(SPECFILE) $(SOURCES) .rpmmacros
+$(RPMS): $(SPECFILE) $(SOURCES)
        mkdir -p BUILD RPMS
        $(RPMBUILD) $(RPMFLAGS) -bb $<
 
@@ -108,9 +150,9 @@ $(wordlist 2,$(words $(RPMS)),$(RPMS)): $(firstword $(RPMS))
 endif
 
 # Build SRPM
-$(SRPM): $(SPECFILE) $(SOURCES) .rpmmacros
+$(SRPM): $(SPECFILE) $(SOURCES)
        mkdir -p SRPMS
-       rpmbuild $(RPMFLAGS) -bs $<
+       $(RPMBUILD) $(RPMFLAGS) -bs $<
 
 # Base rpmbuild in the current directory
 .rpmmacros:
@@ -126,3 +168,13 @@ clean:
        $(MK) $(SPECFILE)
 
 .PHONY: all clean
+
+#################### convenience, for debugging only
+# make +foo : prints the value of $(foo)
+# make ++foo : idem but verbose, i.e. foo=$(foo)
+++%: varname=$(subst +,,$@)
+++%:
+       @echo $(varname)=$($(varname))
++%: varname=$(subst +,,$@)
++%:
+       @echo $($(varname))