PERFORCE change 87345 for review

[soc-andrew]

http://perforce.freebsd.org/chv.cgi?CH=87345

Change 87345 by soc-andrew at soc-andrew_serv on 2005/11/28 06:58:43

	IFC

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#5 integrate
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.dsl#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile#2 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.522 2005/11/22 20:47:43 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -705,12 +705,6 @@
 	false
 .endif
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Making hierarchy"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; \
-	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \

==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#3 (text+ko) ====

@@ -1,3 +1,3 @@
-SUBDIR=aura dfui installer lua
+SUBDIR=aura dfui lua
 
 .include <bsd.subdir.mk>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.dsl#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.9 2005/05/05 17:10:37 murray Exp $ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.10 2005/11/28 06:24:19 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
@@ -97,6 +97,49 @@
      ; None of the above
      (else (empty-sosofo)))))
 
+(mode qandatoc
+  (default
+  (let* ((arch (attribute-string (normalize "arch")))
+	 (role (attribute-string (normalize "role")))
+	 (for-arch (entity-text "arch")))
+    (cond
+
+     ; If role=historic, and we're not printing historic things, then
+     ; don't output this element.
+     ((and (equal? role "historic")
+	   (not %include-historic%))
+      (empty-sosofo))
+      
+
+     ; If arch= not specified, then print unconditionally.  This clause
+     ; handles the majority of cases.
+     ((or (equal? arch #f) (equal? arch ""))
+      (next-match))
+
+     ; arch= specified, see if it's equal to "all".  If so, then
+     ; print unconditionally.  Note that this clause could be
+     ; combined with the check to see if arch= wasn't specified
+     ; or was empty; they have the same outcome.
+     ((equal? arch "all")
+      (next-match))
+
+     ; arch= specified.  If we're building for all architectures,
+     ; then print it prepended with the set of architectures to which
+     ; this element applies.
+     ;
+     ; XXX This doesn't work.
+;     ((equal? for-arch "all")
+;      (sosofo-append (literal "[") (literal arch) (literal "] ")
+;		     (process-children)))
+
+     ; arch= specified, so we need to check to see if the specified
+     ; parameter includes the architecture we're building for.
+     ((string-list-match? for-arch (split-string-to-list arch))
+      (next-match))
+
+     ; None of the above
+     (else (empty-sosofo))))))
+
 ; We might have some sect1 level elements where the modification times
 ; are significant.  An example of this is the "What's New" section in
 ; the release notes.  We enable the printing of pubdate entry in

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile#2 (text+ko) ====

@@ -1,3 +1,3 @@
-SUBDIR=backend install_ncurses
+SUBDIR=install_ncurses
 
 .include <bsd.subdir.mk>