Changeset 6d0dbc3

Timestamp:

08/12/2006 12:34:01 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

dc67791

Parents:

28ff443

Message:

Moved Makefile creation to their own script.
The user MUST to edit/review the build scripts before generating the Makefile.
Fixed SRC_ARCHIVE and FTP_SERVER settings.

Location:

BLFS

Files:

• blfs-parser.sh (modified) (3 diffs)
• gen-makefile.sh (moved) (moved from BLFS/libs/func_makefile ) (5 diffs, 1 prop)
• libs/constants.inc (modified) (1 diff)
• libs/scripts.xsl (modified) (1 diff)
• makefile.conf (added)

BLFS/blfs-parser.sh

@@ -34 +34 @@
 source libs/func_parser
 [[ $? > 0 ]] && echo -e "\n\tERROR: func_parser did not load..\n" && exit
-
-#---------------------
-# Makefile module
-source libs/func_makefile
-[[ $? > 0 ]] && echo -e "\n\tERROR: func_makefile did not load..\n" && exit
 
 
@@ -107 +102 @@
 
 
-
-
-
 #------- MAIN --------
 if [[ ! -f packages ]] ; then
@@ -123 +115 @@
 generate_target_book
 create_build_scripts
-generate_Makefile

BLFS/gen-makefile.sh

@@ -1 @@
-#####
-#
-#
+#!/bin/bash
 #
 # $Id$
-#####
+#
+set -e
+
+
 
 # TEMPORARY VARIABLES.. development use only
-declare MKFILE=devMakefile
+declare MKFILE=Makefile
 declare PREV_PACKAGE=""
 declare BUILD_SCRIPTS=scripts
 declare TRACKING_DIR=/var/lib/jhalfs/BLFS
+
+HEADER="# This file is automatically generated by jhalfs
+# YOU MAY NEED TO EDIT THIS FILE MANUALLY
+#
+# Generated on `date \"+%F %X %Z\"`"
 
 
@@ -37 +43 @@
 (
 cat << EOF
-        @( time { ${BUILD_SCRIPTS}/${file} >>logs/${this_script} 2>&1 ; } ) 2>>logs/${this_script}
+        @( time { source ../makefile.conf && ${BUILD_SCRIPTS}/${file} >>logs/${this_script} 2>&1 ; } ) 2>>logs/${this_script}
 EOF
 ) >> $MKFILE.tmp
@@ -95 +101 @@
   >$MKFILE.tmp
 
-  
+
   for package_script in scripts/* ; do
     this_script=`basename $package_script`
@@ -112 +118 @@
 $HEADER
 
-PACKAGE= "`basename $PKGXML .xml`"
+PACKAGE= "`basename $PWD`"
 TRACKING_DIR= $TRACKING_DIR
 
@@ -148 +154 @@
 
 }
+
+generate_Makefile
+
+cp ../progress_bar.sh .
+
+mkdir -p logs

BLFS/libs/constants.inc

@@ -34 +34 @@
 declare -r R_arrow=$'\e[1;33m>\e[0m'
 declare -r L_arrow=$'\e[1;33m<\e[0m'
-
-HEADER="# This file is automatically generated by jhalfs
-# DO NOT EDIT THIS FILE MANUALLY
-#
-# Generated on `date \"+%F %X %Z\"`"

BLFS/libs/scripts.xsl

@@ -305 +305 @@
         <xsl:text>    cp $SRC_ARCHIVE/$PACKAGE $PACKAGE&#xA;  else&#xA;</xsl:text>
         <!-- The FTP_SERVER mirror -->
-        <xsl:text>    wget $FTP_SERVER/BLFS/conglomeration/$PKG_DIR/$PACKAGE</xsl:text>
+        <xsl:text>    wget ${FTP_SERVER}conglomeration/$PKG_DIR/$PACKAGE</xsl:text>
         <!-- Upstream HTTP URL -->
         <xsl:if test="string-length(ulink/@url) &gt; '10' and