Changeset 3e7ceed for jhalfs

Timestamp:

12/15/2006 10:53:10 AM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

fcb540b

Parents:

830f28d

Message:

Ported CUSTOM_TOOLS support to all books.

File:

• jhalfs (modified) (5 diffs)

jhalfs

@@ -333 +333 @@
     mkdir -p $JHALFSDIR
   fi
-  #
+
   # Create $BUILDDIR/sources even though it could be created by get_sources()
   if [[ ! -d $BUILDDIR/sources ]]; then
@@ -345 +345 @@
   >$LOGDIR/$LOG
   #
+  # Copy common helper files
+  cp $COMMON_DIR/{makefile-functions,progress_bar.sh,packages.xsl} $JHALFSDIR/
+  #
+  # Fix the XSL book parser
+  sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
+  export XSL=$JHALFSDIR/${XSL}
+  #
+
+  # Copy urls.xsl, if needed
+  [[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  #
+  # Create the test-log directory, if needed
   [[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR
   #
-  cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
-  #
-  [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
-  #
-  if [[ "$COMPARE" = "y" ]]; then
-    mkdir -p $JHALFSDIR/extras
-    cp extras/* $JHALFSDIR/extras
-  fi
-  #
-  if [[ -n "$FILES" ]]; then
-    # pushd/popd necessary to deal with multiple files
-    pushd $PACKAGE_DIR 1> /dev/null
-      cp $FILES $JHALFSDIR/
-    popd 1> /dev/null
-  fi
-  #
-  if [[ "${PROGNAME}" = "lfs" ]]; then
-    if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
-      echo "Copying custom tool scripts to $JHALFSDIR"
-      mkdir -p $JHALFSDIR/custom-commands/config
-      mkdir -p $JHALFSDIR/custom-commands/scripts
-    cp -Rf custom/* $JHALFSDIR/custom-commands
-    fi
-  fi
-
-  #
+  # Prepare report creation, if needed
   if [[ "$REPORT" = "y" ]]; then
     cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
@@ -380 +367 @@
   fi
   #
-  [[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
-  #
-  cp $COMMON_DIR/packages.xsl  $JHALFSDIR/
-  #
-  sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
-  export XSL=$JHALFSDIR/${XSL}
-
+  # Copy optimize files, if needed
+  [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
+  #
+  # Copy compare files, if needed
+  if [[ "$COMPARE" = "y" ]]; then
+    mkdir -p $JHALFSDIR/extras
+    cp extras/* $JHALFSDIR/extras
+  fi
+  #
+
+  # Copy custom tools config files, if requested
+  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
+    echo "Copying custom tool scripts to $JHALFSDIR"
+    mkdir -p $JHALFSDIR/custom-commands
+    cp -f custom/config/* $JHALFSDIR/custom-commands
+  fi
+  #
   # Install blfs-tool, if requested.
   if [[ "${BLFS_TOOL}" = "y" ]] ; then
@@ -406 +403 @@
     rm -rf $JHALFSDIR/blfs-tool-deps/.svn
   fi
+  #
 
   get_book
@@ -438 +436 @@
 
 build_Makefile
-if [[ "${PROGNAME}" = "lfs" ]]; then
-  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
-    add_CustomTools
-  fi
-fi
+
 echo "${SD_BORDER}${nl_}"