zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DocBook-XSL package is not required for now.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2007-07-24 21:04:34 +00:00
parent cf829f0624
commit e05fba2435
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Config.in
View file

@ -553,9 +553,9 @@ menu "--- BOOK Settings"
default y
depends on DEP_DBXML
config DEP_DBXSL
bool "DocBook XSL (required)"
default y
#config DEP_DBXSL
#bool "DocBook XSL (required)"
#default y
config DEP_LINKS
bool "links (required)"

12
common/libs/func_blfs_deps
View file

@ -29,9 +29,9 @@ add_blfs_deps_urls() { # No easy way to extract it.
echo "${DBXML_URL} ${BLFS_SERVER}docbook-xml/${DBXML_PKG} ${DBXML_MD5}" >> urls.lst
fi
if [[ "${DEP_DBXSL}" = "y" ]] ; then
echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
fi
# if [[ "${DEP_DBXSL}" = "y" ]] ; then
# echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
# fi
if [[ "${DEP_LINKS}" = "y" ]] ; then
echo "${LINKS_URL} ${BLFS_SERVER}links/${LINKS_PKG} ${LINKS_MD5}" >> urls.lst
@ -84,9 +84,9 @@ copy_blfs_deps_scripts() { # method avoid to place the test on all
mv blfs-tool-deps/905-docbook-xml ${PROGNAME}-commands/blfs-tool-deps
fi
if [[ "${DEP_DBXSL}" = "y" ]] ; then
mv blfs-tool-deps/906-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
fi
# if [[ "${DEP_DBXSL}" = "y" ]] ; then
# mv blfs-tool-deps/906-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
# fi
if [[ "${DEP_LINKS}" = "y" ]] ; then
mv blfs-tool-deps/908-links ${PROGNAME}-commands/blfs-tool-deps

16
common/libs/func_check_version.sh
View file

@ -149,14 +149,14 @@ XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
fi
fi
if [[ -z "$DEP_DBXSL" ]] ; then
if `echo $XML_FILE | xsltproc --noout - 2>/dev/null` ; then
check_version "1.69.1" "1.69.1" "DocBook XSL"
else
echo "Warning: not found a working DocBook XSL 1.69.1 installation"
exit 2
fi
fi
# if [[ -z "$DEP_DBXSL" ]] ; then
# if `echo $XML_FILE | xsltproc --noout - 2>/dev/null` ; then
# check_version "1.69.1" "1.69.1" "DocBook XSL"
# else
# echo "Warning: not found a working DocBook XSL 1.69.1 installation"
# exit 2
# fi
# fi
fi # end BLFS_TOOL=Y

4
common/libs/func_validate_configs.sh
View file

@ -54,10 +54,10 @@ inline_doc
local -r clfs3_PARAM_LIST="$CLFS3_book $GENERAL_common $CLFS3_build $ADVANCED_common"
local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
# Additional variables
# Additional variables (add DEP_DBXSL when required again)
local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP \
DEP_DBXML DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET \
DEP_DBXML DEP_LINKS DEP_SUDO DEP_WGET \
DEP_SVN DEP_GPM"
local -r custom_tool_PARAM_LIST="TRACKING_DIR"

6
jhalfs
View file

@ -194,9 +194,9 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
DBXML_URL="http://www.docbook.org/xml/4.5/${DBXML_PKG}"
DBXML_MD5="03083e288e87a7e829e437358da7ef9e"
# DocBook XSL
DBXSL_PKG="docbook-xsl-1.69.1.tar.bz2"
DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}"
DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552"
# DBXSL_PKG="docbook-xsl-1.69.1.tar.bz2"
# DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}"
# DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552"
# Links
LINKS_PKG="links-2.1pre23.tar.bz2"
LINKS_URL="http://links.twibright.com/download/${LINKS_PKG}"