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

Using PKGDIR in all chapters.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2005-10-02 14:28:31 +00:00
parent 24530379e6
commit 56dd1e2ed2
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dump-lfs-scripts.xsl
View file

@ -44,9 +44,9 @@
<!-- Creating dirs and files --> <!-- Creating dirs and files -->
<exsl:document href="{$dirname}/{$order}-{$filename}" method="text"> <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
<xsl:text>#!/bin/sh&#xA;&#xA;</xsl:text> <xsl:text>#!/bin/sh&#xA;&#xA;</xsl:text>
<xsl:if test="(sect2[@role='installation'] or <xsl:if test="sect2[@role='installation'] or
@id='ch-tools-adjusting') and @id='ch-tools-adjusting' or
ancestor::chapter[@id='chapter-temporary-tools']"> @id='ch-system-readjusting'">
<xsl:text>cd $PKGDIR &amp;&amp;&#xA;</xsl:text> <xsl:text>cd $PKGDIR &amp;&amp;&#xA;</xsl:text>
</xsl:if> </xsl:if>
<xsl:apply-templates select=".//para/userinput | .//screen"/> <xsl:apply-templates select=".//para/userinput | .//screen"/>
@ -61,9 +61,9 @@
<xsl:otherwise> <xsl:otherwise>
<xsl:apply-templates select="userinput" mode="screen"/> <xsl:apply-templates select="userinput" mode="screen"/>
<xsl:if test="position() != last() and <xsl:if test="position() != last() and
not(contains(string(),'EOF')) and not(contains(string(),'EOF')) and
not(contains(string(),'check')) and not(contains(string(),'check')) and
not(ancestor::sect1[@id='ch-tools-stripping'])"> not(ancestor::sect1[@id='ch-tools-stripping'])">
<xsl:text> &amp;&amp;</xsl:text> <xsl:text> &amp;&amp;</xsl:text>
</xsl:if> </xsl:if>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
@ -73,8 +73,9 @@
</xsl:template> </xsl:template>
<xsl:template match="para/userinput"> <xsl:template match="para/userinput">
<xsl:if test="$testsuite != '0' and (contains(string(),'test') or <xsl:if test="$testsuite != '0' and
contains(string(),'check'))"> (contains(string(),'test') or
contains(string(),'check'))">
<xsl:value-of select="substring-before(string(),'make')"/> <xsl:value-of select="substring-before(string(),'make')"/>
<xsl:text>make -k</xsl:text> <xsl:text>make -k</xsl:text>
<xsl:value-of select="substring-after(string(),'make')"/> <xsl:value-of select="substring-after(string(),'make')"/>

8
jhalfs
View file

@ -158,7 +158,7 @@ get_book() {
# Test to make sure the LFS version is set # Test to make sure the LFS version is set
if [ -z $LFSVRS ] ; then LFSVRS=development ; fi if [ -z $LFSVRS ] ; then LFSVRS=development ; fi
# Set the book's soures directory # Set the book's sources directory
if [ -z $BOOK ] ; then BOOK=lfs-$LFSVRS ; fi if [ -z $BOOK ] ; then BOOK=lfs-$LFSVRS ; fi
if [ -z $WC ] ; then if [ -z $WC ] ; then
@ -460,7 +460,8 @@ build_Makefile() {
# Insert instructions for unpacking the package and changing directories # Insert instructions for unpacking the package and changing directories
echo -e "\t\$(call unpack,$FILE)" >> $MKFILE.tmp echo -e "\t\$(call unpack,$FILE)" >> $MKFILE.tmp
echo -e "\t-ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\" >> $MKFILE.tmp echo -e "\t-ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\" >> $MKFILE.tmp
echo -e "\tcd \$(SRC)/\$\$ROOT && \\" >> $MKFILE.tmp echo -e "\techo \"PKGDIR=\$(SRC)/\$\$ROOT\" > envars && \\" >> $MKFILE.tmp
echo -e "\techo \"export PKGDIR\" >> envars && \\" >> $MKFILE.tmp
fi fi
# Inser date and disk usage at the top of the log file. # Inser date and disk usage at the top of the log file.
@ -468,7 +469,8 @@ build_Makefile() {
# For the Re-Adjusting phase we must to cd to the binutils-build directory. # For the Re-Adjusting phase we must to cd to the binutils-build directory.
if [ "$i" = "067-readjusting" ] ; then if [ "$i" = "067-readjusting" ] ; then
echo -e "\tcd \$(SRC)/binutils-build && \\" >> $MKFILE.tmp echo -e "\techo \"PKGDIR=\$(SRC)/binutils-build\" > envars && \\" >> $MKFILE.tmp
echo -e "\techo \"export PKGDIR\" >> envars && \\" >> $MKFILE.tmp
fi fi
# Insert the script run # Insert the script run