Changeset a6655ff

Timestamp:

07/16/2006 10:06:03 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

7fdd8f6

Parents:

7785f91

Message:

Avoiding hardcoded supported books versions.

Files:

• CLFS/config (modified) (1 diff)
• HLFS/config (modified) (1 diff)
• LFS/config (modified) (1 diff)
• common/common-functions (modified) (5 diffs)
• common/func_validate_configs.sh (modified) (1 diff)
• master.sh (modified) (1 diff)

CLFS/config

@@ -69 +69 @@
 #--- Book version
 LFSVRS=development
+TREE=trunk/BOOK
 
 #--- Name of the makefile

HLFS/config

@@ -39 +39 @@
 #--- Book version
 LFSVRS=development
+TREE=trunk/BOOK
 
 #--- Name of the makefile

LFS/config

@@ -33 +33 @@
 #--- Book version
 LFSVRS=development
+TREE=trunk/BOOK
 
 #--- Name of the makefile

common/common-functions

@@ -53 +53 @@
 ${BOLD}  -B, --book VER${OFF}
         use VER version of the book as the system to build.
-        Supported versions are: dev*, trunk, SVN
-        These are aliases for the Development version of {C,H}LFS
+        Supported VER values are:
+          dev*, trunk, SVN = aliases for the Development version of {C,H}LFS
+          branch-NAME = a branch of name NAME
+          VERSION = the version of a stable released book
+        To know what branches and stable books works with this version of jhalfs
+        please see http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks
 
 ${BOLD}  -D  --directory DIR${OFF}
@@ -654 +658 @@
          test -f $JHALFSDIR/pkg_tarball_list ; then
         # Set the canonical book version
-        echo -ne "done\n" 
+        echo -ne "done\n"
         cd $JHALFSDIR
         case $PROGNAME in
@@ -668 +672 @@
       fi
     else
-      case $LFSVRS in
-        development)
-           svn co $SVN/${svn_root}/trunk/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
-      esac
+      svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
       echo -ne "done\n"
       extract_commands
@@ -680 +681 @@
     extract_commands
   fi
-  echo -ne " Document version ${L_arrow}${BOLD}${VERSION}${R_arrow}\n" 
+  echo -ne " Document version ${L_arrow}${BOLD}${VERSION}${R_arrow}\n"
 }
 
@@ -693 +694 @@
   cd $JHALFSDIR
   case $PROGNAME in
-    clfs) 
+    clfs)
       VERSION=$(xmllint --noent $BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
     *)

common/func_validate_configs.sh

@@ -217 +217 @@
                      validate_dir -z -d
                    else
-                     validate_against_str "x${PROGNAME}-developmentx"
+                     validate_against_str "x${PROGNAME}-${LFSVRS}x"
                    fi ;;
 

master.sh

@@ -106 +106 @@
         dev* | SVN | trunk )
           LFSVRS=development
-          ;;
-        *) if [[ "$PROGNAME" = "lfs" ]]; then
-             case $1 in
-               6.1.1 )
-                 echo "For stable 6.1.1 book, please use jhalfs-0.2."
-                 exit 0
-                ;;
-               * )
-                 echo "$1 is an unsupported version at this time."
-                 exit 0
-                ;;
-             esac
-           else
-             echo "The requested version, ${L_arrow} ${BOLD}$1${OFF} ${R_arrow}, is undefined in the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} series."
-             exit 0
-           fi
+          TREE=trunk/BOOK
+          ;;
+        branch-* )
+          LFSVRS=$1
+          TREE=branches/${1#branch-}/BOOK
+          ;;
+        * )
+          case $PROGNAME in
+            lfs | hlfs )
+              LFSVRS=$1
+              TREE=tags/$1/BOOK
+              ;;
+            clfs )
+              LFSVRS=$1
+              TREE=tags/$1
+              ;;
+          esac
           ;;
       esac