Changeset 2ee1d11 for jhalfs

Timestamp:

10/07/2006 07:14:47 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

42e1b38

Parents:

f5791f0

Message:

Merged r3147:3173 from trunk.

File:

• jhalfs (modified) (6 diffs)

jhalfs

@@ -91 +91 @@
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
-      #--- Envars not sourced from configuration
-declare -r SVN="svn://svn.linuxfromscratch.org"
-declare -r LOG=000-masterscript.log
-
 # These are boolean vars generated from Config.in.
 # ISSUE: If a boolean parameter is not set <true> that
@@ -130 +126 @@
     LFSVRS=${BRANCH_ID}
     TREE=branches/${BRANCH_ID#branch-}/BOOK
+    ;;
+  2.4-branch )
+    LFSVRS=${BRANCH_ID}
+    TREE=branches/2.4-branch
     ;;
   * )
@@ -178 +178 @@
   TIDY_PATCH_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${TIDY_PATCH}"
   TIDY_PATCH_MD5="82f67f7af58fc2c945b3410ae655cc1a"
+    # tidy docs
+  TIDY_DOCS="tidy_docs_051020.tgz"
+  TIDY_DOCS_URL="http://tidy.sourceforge.net/docs/${TIDY_DOCS}"
+  TIDY_DOCS_MD5="86de2f198e57399c063d2567b2a25628"
     # unzip
   UNZIP_PKG="unzip552.tar.gz"
@@ -224 +228 @@
 fi
 
+#--- Envars not sourced from configuration
+case $PROGNAME in
+  clfs* ) declare -r SVN="http://svn.cross-lfs.org/svn/repos" ;;
+      * ) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
+esac
+declare -r LOG=000-masterscript.log
+  # Needed to can fetch BLFS book sources when building CLFS
+declare -r SVN_2="svn://svn.linuxfromscratch.org"
+
 # Set true internal variables
 COMMON_DIR="common"
@@ -269 +282 @@
 read ANSWER
 if [ x$ANSWER != "xyes" ] ; then
-  echo "${nl_}Fix the configuration options and rerun the script.${nl_}"
+  echo "${nl_}Rerun make to fix the configuration options.${nl_}"
   exit 1
 fi
@@ -384 +397 @@
   if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
     mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
-    svn co $SVN/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
+    svn co $SVN_2/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
   else
     pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null