Changeset 4dafc45

Timestamp:

09/11/2005 09:33:50 PM (19 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

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

Children:

f8de156

Parents:

1236262

Message:

Added a 'jhalfs' directory in the BUILDDIR to keep jhalfs stuff all together

File:

• jhalfs (modified) (10 diffs)

jhalfs

@@ -102 +102 @@
 HTTP=http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
 BUILDDIR=/mnt/lfs
+JHALFSDIR=$BUILDDIR/jhalfs
 LOG=build.log
 
@@ -108 +109 @@
   test `type -p svn` || eval "echo \"This feature requires Subversion.\"
         exit 1"
-  cd $BUILDDIR
+  cd $JHALFSDIR
  
   # Test to make sure the LFS version is set
@@ -119 +120 @@
   if [ -d lfs-$LFSVRS ] ; then
         cd lfs-$LFSVRS
-        if svn up | grep -q At && test -d $BUILDDIR/commands && \
-        test -f $BUILDDIR/packages && test -f $BUILDDIR/patches ; then
+        if svn up | grep -q At && test -d $JHALFSDIR/commands && \
+        test -f $JHALFSDIR/packages && test -f $JHALFSDIR/patches ; then
                 echo -ne "done\n"
                 get_sources
@@ -129 +130 @@
   else
         if [ $LFSVRS = development ] ; then 
-                svn co $SVN/LFS/trunk/BOOK lfs-$LFSVRS >>$BUILDDIR/$LOG 2>&1
+                svn co $SVN/LFS/trunk/BOOK lfs-$LFSVRS >>$JHALFSDIR/$LOG 2>&1
         else
-                svn co $SVN/LFS/branches/$LFSVRS/BOOK lfs-$LFSVRS >>$BUILDDIR/$LOG 2>&1
+                svn co $SVN/LFS/branches/$LFSVRS/BOOK lfs-$LFSVRS >>$JHALFSDIR/$LOG 2>&1
         fi
         echo -ne "done\n"
@@ -142 +143 @@
   test `type -p xsltproc` || eval "echo \"This feature requires libxslt.\"
         exit 1"
-  cd $BUILDDIR
+  cd $JHALFSDIR
 
   # Start clean
@@ -151 +152 @@
   xsltproc -v --nonet --xinclude -o ./commands/ \
   lfs-$LFSVRS/stylesheets/dump-commands.xsl lfs-$LFSVRS/index.xml \
-  >>$BUILDDIR/$LOG 2>&1
+  >>$JHALFSDIR/$LOG 2>&1
 
   # Move the text files out from the chapter directories, and dump them
@@ -160 +161 @@
 
   # Grab the patches and package names.
-  cd $BUILDDIR
+  cd $JHALFSDIR
   for i in patches packages ; do rm -f $i ; done
   grep "\-version" lfs-$LFSVRS/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
@@ -226 +227 @@
 
   # Iterate through each package and grab it, along with any patches it needs.
-  for i in `cat $BUILDDIR/packages` ; do
+  for i in `cat $JHALFSDIR/packages` ; do
     PKG=`echo $i | sed 's/-version.*//'`
     
@@ -239 +240 @@
     fi
     download $PKG $FILE
-    for patch in `grep "$PKG-&$PKG" $BUILDDIR/patches` ; do
+    for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
         PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
         download $PKG $PATCH
@@ -247 +248 @@
 
 
-if [ ! -d $BUILDDIR ] ; then
-        mkdir $BUILDDIR
+if [ ! -d $JHALFSDIR ] ; then
+        mkdir -p $JHALFSDIR
 fi
 
->$BUILDDIR/$LOG
-cp $0 $BUILDDIR/
+>$JHALFSDIR/$LOG
+cp $0 $JHALFSDIR/
 get_book