Changeset e576789 for BLFS/gen-makefile.sh

Timestamp:

10/29/2013 03:42:03 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

5795ad7

Parents:

2e64c47

Message:

Merge ablfs branch. Normally, jhalfs should not perform differently
for building LFS

File:

• BLFS/gen-makefile.sh (modified) (10 diffs)

BLFS/gen-makefile.sh

@@ -5 +5 @@
 set -e
 
-# TEMPORARY VARIABLES.. development use only
+declare TOPDIR='..'
+declare ATOPDIR=`cd $TOPDIR; pwd`
 declare MKFILE=Makefile
 declare PREV_PACKAGE=""
-declare BUILD_SCRIPTS=scripts
-declare TRACKING_DIR=tracking-dir
+declare BUILD_SCRIPTS=${TOPDIR}/scripts
+declare TRACKING_FILE=tracking-dir/instpkg.xml
+declare XSLDIR=${TOPDIR}/xsl
+declare PACK_FILE=${TOPDIR}/packages.xml
+declare BUMP=${XSLDIR}/bump.xsl
 
 HEADER="# This file is automatically generated by gen-makefile.sh
@@ -39 +43 @@
 (
 cat << EOF
-        @source ../envars.conf && ${BUILD_SCRIPTS}/\$@ >logs/\$@ 2>&1
+        @source ${TOPDIR}/envars.conf && ${BUILD_SCRIPTS}/\$@ >logs/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -48 +52 @@
 #----------------------------------#
   local pkg_name=$1
-  local pkg_ver=$2
-  local alsa_ver=$(grep "^alsa[[:space:]]" ../packages | cut -f3)
-  local kde_core_ver=$(grep "^kde-core[[:space:]]" ../packages | cut -f3)
-  local xorg7_ver=$(grep "^xorg7[[:space:]]" ../packages | cut -f3)
-
-  if [[ -n "$pkg_ver" ]] ; then
-(
-cat << EOF
-        @rm -f \$(TRACKING_DIR)/${pkg_name#*-?-}-{0..9}* && \\
-        touch \$(TRACKING_DIR)/${pkg_name#*-?-}-${pkg_ver}
-EOF
-) >> $MKFILE.tmp
-  fi
-
-  case $pkg_name in
-    *-alsa-lib ) #this the unique mandatory package for ALSA support.
-(
-cat << EOF
-        @rm -f \$(TRACKING_DIR)/alsa-{0..9}* && \\
-        touch \$(TRACKING_DIR)/alsa-${alsa_ver}
-EOF
-) >> $MKFILE.tmp
-      ;;
-    *-kdebase )
-(
-cat << EOF
-        @rm -f \$(TRACKING_DIR)/kde-core-{0..9}* && \\
-        touch \$(TRACKING_DIR)/kde-core-${kde_core_ver}
-EOF
-) >> $MKFILE.tmp
-      ;;
-    *-xorg7-driver ) # xtrerm2 and rman are optional
-(
-cat << EOF
-        @rm -f \$(TRACKING_DIR)/xorg7-{0..9}* && \\
-        touch \$(TRACKING_DIR)/xorg7-${xorg7_ver}
-EOF
-) >> $MKFILE.tmp
-      ;;
-  esac
 
 (
 cat << EOF
-        @touch  \$@ && \\
+        @xsltproc --stringparam packages ${PACK_FILE} \\
+        --stringparam package ${pkg_name#*-?-} \\
+        -o track.tmp \\
+        ${BUMP} \$(TRACKING_FILE) && \\
+        sed -i 's@PACKDESC@${ATOPDIR}/packdesc.dtd@' track.tmp && \\
+        xmllint --format --postvalid track.tmp > \$(TRACKING_FILE) && \\
+        rm track.tmp && \\
+        touch  \$@ && \\
         sleep .25 && \\
         echo -e "\n\n "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -104 +75 @@
 #----------------------------#
   local script_name=$1
-  local pkg_ver=$2
 
   echo -n "${tab_}${tab_} entry for <$script_name>"
@@ -119 +89 @@
   # Include a touch of the target name so make can check
   # if it's already been made.
-  __wrt_touch "${script_name}" "${pkg_ver}"
+  __wrt_touch "${script_name}"
   #
   #--------------------------------------------------------------------#
@@ -125 +95 @@
   #--------------------------------------------------------------------#
   echo " .. OK"
-}
-
-#----------------------------#
-__write_meta_pkg_touch() {   #
-#----------------------------#
-  local meta_pkg=$1
-  local pkg_ver=$(grep "^${meta_pkg}[[:space:]]" ../packages | cut -f3)
-  local gnome_core_ver=$(grep "^gnome-core[[:space:]]" ../packages | cut -f3)
-  local kde_full_ver=$(grep "^kde-full[[:space:]]" ../packages | cut -f3)
-
-(
-cat << EOF
-
-999-z-$meta_pkg:  $PREV_PACKAGE
-        @rm -f \$(TRACKING_DIR)/${meta_pkg}-{0..9}* && \\
-        touch \$(TRACKING_DIR)/${meta_pkg}-${pkg_ver}
-EOF
-) >> $MKFILE.tmp
-
-  case $meta_pkg in
-    gnome-full )
-(
-cat << EOF
-        @rm -f \$(TRACKING_DIR)/gnome-core-{0..9}* && \\
-        touch \$(TRACKING_DIR)/gnome-core-${gnome_core_ver}
-EOF
-) >> $MKFILE.tmp
-      ;;
-    kde-koffice )
-(
-cat << EOF
-        @rm -f \$(TRACKING_DIR)/kde-full-{0..9}* && \\
-        touch \$(TRACKING_DIR)/kde-full-${kde_full_ver}
-EOF
-) >> $MKFILE.tmp
-      ;;
-  esac
-
-(
-cat << EOF
-        @touch  \$@
-EOF
-) >> $MKFILE.tmp
-
 }
 
@@ -183 +109 @@
 
 
-  for package_script in scripts/* ; do
+  for package_script in ${BUILD_SCRIPTS}/* ; do
     this_script=`basename $package_script`
-    pkg_ver=$(grep "^${this_script#*-?-}[[:space:]]" ../packages | cut -f3)
     pkg_list="$pkg_list ${this_script}"
-    __write_entry "${this_script}" "${pkg_ver}"
+    __write_entry "${this_script}"
     PREV_PACKAGE=${this_script}
   done
 
-  PACKAGE=$(basename $PWD)
-
-   # alsa, kde-core and xorg7 are also available dependencies, thus handled
-   # in another way.
-  case $PACKAGE in
-    gnome-core | \
-    gnome-full | \
-    kde-full | \
-    kde-koffice )  pkg_list="$pkg_list 999-z-${PACKAGE}"
-                  __write_meta_pkg_touch "${PACKAGE}"
-                  ;;
-  esac
-
-
-  # Add a header, some variables and include the function file
-  # to the top of the real Makefile.
 (
     cat << EOF
 $HEADER
 
-PACKAGE= $PACKAGE
-TRACKING_DIR= $TRACKING_DIR
+TRACKING_FILE= $TRACKING_FILE
 
 BOLD= "[0;1m"
@@ -229 +137 @@
 
 
-define fin_message
+define end_message
   @echo \$(BOLD)
   @echo --------------------------------------------------------------------------------
@@ -237 +145 @@
 
 all : $pkg_list
-        @\$(call fin_message )
+        @\$(call end_message )
 EOF
 ) > $MKFILE
@@ -248 +156 @@
 }
 
-if [[ -e Config.in ]] ; then
-  echo -e "\n\tThis script must be run from inside a target package directory.\n"
+if [[ ! -d ${BUILD_SCRIPTS} ]] ; then
+  echo -e "\n\tThe \'${BUILD_SCRIPTS}\' directory has not been found.\n"
   exit 1
 fi
 
-if [[ ! -d scripts ]] ; then
-  echo -e "\n\tNo ./scripts/ directory has been found.\n"
-  exit 1
-fi
+# Let us make a clean base:
+rm -rf *
 
 generate_Makefile
 
-cp ../progress_bar.sh .
+cp ${TOPDIR}/progress_bar.sh .
 
 mkdir -p logs