- Timestamp:
- 06/15/2019 03:26:23 PM (5 years ago)
- Branches:
- ablfs-more, legacy, trunk
- Children:
- cf2f109
- Parents:
- 77a8042
- Location:
- BLFS/xsl
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
BLFS/xsl/gen-install.xsl
r77a8042 r619b313 7 7 8 8 <xsl:template match="screen" mode="installation"> 9 <xsl:param name="want-stats" select="false"/> 9 10 <!-- "nature" variables: 10 11 - 'non-root': executable as user … … 36 37 37 38 <xsl:variable 39 name="prec-screen" 40 select="preceding::screen[not(@role='nodump') and ./userinput][1] 41 [ancestor::sect2 = current()/ancestor::sect2]"/> 42 43 <xsl:variable 38 44 name="prec-string" 39 select="string( preceding-sibling::screen[not(@role='nodump') and40 ./userinput][1])"/> 45 select="string($prec-screen)"/> 46 41 47 <!-- 42 48 <xsl:message> … … 61 67 <xsl:when 62 68 test="$prec-string='' or 63 (preceding -sibling::screen[not(@role='nodump') and64 65 preceding -sibling::para/command[contains(text(),'check') or66 69 (preceding::screen[not(@role='nodump') and 70 ./userinput] | 71 preceding::command[contains(text(),'check') or 72 contains(text(),'test')] 67 73 )[last()][self::command]"> 68 74 <xsl:text>none</xsl:text> 69 75 </xsl:when> 70 <xsl:when 71 test="preceding-sibling::screen 72 [not(@role='nodump') and ./userinput][1][not(@role)]"> 76 <xsl:when test="$prec-screen[not(@role)]"> 73 77 <xsl:text>non-root</xsl:text> 74 78 </xsl:when> … … 91 95 92 96 <xsl:variable 97 name="follow-screen" 98 select="following::screen[not(@role='nodump') and ./userinput][1] 99 [ancestor::sect2 = current()/ancestor::sect2]"/> 100 101 <xsl:variable 93 102 name="follow-string" 94 select="string(following-sibling::screen[not(@role='nodump') and 95 ./userinput][1])"/> 103 select="string($follow-screen)"/> 96 104 97 105 <xsl:variable name="follow-nature"> … … 99 107 <xsl:when 100 108 test="$follow-string='' or 101 (following -sibling::screen[not(@role='nodump') and102 103 following -sibling::para/command[contains(text(),'check') or104 109 (following::screen[not(@role='nodump') and 110 ./userinput] | 111 following::command[contains(text(),'check') or 112 contains(text(),'test')] 105 113 )[1][self::command]"> 106 114 <xsl:text>none</xsl:text> 107 115 </xsl:when> 108 <xsl:when 109 test="following-sibling::screen 110 [not(@role='nodump') and ./userinput][1][not(@role)]"> 116 <xsl:when test="$follow-screen[not(@role)]"> 111 117 <xsl:text>non-root</xsl:text> 112 118 </xsl:when> … … 138 144 </xsl:if> 139 145 <xsl:apply-templates/> 140 <xsl:text>141 </xsl:text>142 146 </xsl:when> 143 147 … … 150 154 </xsl:if> 151 155 <xsl:apply-templates mode="root"/> 152 <xsl:text>153 </xsl:text>154 156 <xsl:if test="$follow-nature='none'"> 155 157 <xsl:call-template name="end-root"/> … … 159 161 <xsl:when test="$my-nature='install'"> 160 162 <xsl:if test="$prec-nature='none' or $prec-nature='non-root'"> 161 <xsl:if test="contains($list-stat-norm, 162 concat(' ',ancestor::sect1/@id,' '))"> 163 <xsl:if test="$want-stats"> 163 164 <xsl:call-template name="output-destdir"/> 164 165 </xsl:if> … … 167 168 </xsl:if> 168 169 <xsl:if test="$prec-nature='config'"> 169 <xsl:if test="contains($list-stat-norm, 170 concat(' ',ancestor::sect1/@id,' '))"> 170 <xsl:if test="$want-stats"> 171 171 <xsl:call-template name="end-root"/> 172 172 <xsl:call-template name="output-destdir"/> … … 176 176 </xsl:if> 177 177 <xsl:apply-templates mode="install"/> 178 <xsl:text>179 </xsl:text>180 178 <xsl:if test="$follow-nature='none'"> 181 179 <xsl:call-template name="end-install"/> … … 189 187 <xsl:template name="begin-root"> 190 188 <xsl:if test="$sudo='y'"> 191 <xsl:text> sudo -E sh << ROOT_EOF192 </xsl:text>189 <xsl:text> 190 sudo -E sh << ROOT_EOF</xsl:text> 193 191 </xsl:if> 194 192 </xsl:template> … … 196 194 <xsl:template name="begin-install"> 197 195 <xsl:if test="$wrap-install = 'y'"> 198 <xsl:text>if [ -r "$JH_PACK_INSTALL" ]; then 196 <xsl:text> 197 if [ -r "$JH_PACK_INSTALL" ]; then 199 198 source $JH_PACK_INSTALL 200 199 export -f wrapInstall 201 200 export -f packInstall 202 201 fi 203 wrapInstall ' 204 </xsl:text> 202 wrapInstall '</xsl:text> 205 203 </xsl:if> 206 204 </xsl:template> … … 208 206 <xsl:template name="end-root"> 209 207 <xsl:if test="$sudo='y'"> 210 <xsl:text> ROOT_EOF211 </xsl:text>208 <xsl:text> 209 ROOT_EOF</xsl:text> 212 210 </xsl:if> 213 211 </xsl:template> … … 220 218 </xsl:if> 221 219 <xsl:if test="$wrap-install = 'y'"> 222 <xsl:text>'
packInstall
</xsl:text> 223 </xsl:if> 224 </xsl:template> 225 226 <xsl:template match="text()" mode="install"> 220 <xsl:text>'
packInstall</xsl:text> 221 </xsl:if> 222 </xsl:template> 223 224 <xsl:template match="userinput" mode="install"> 225 <xsl:text> 226 </xsl:text> 227 227 <xsl:call-template name="output-install"> 228 <xsl:with-param name="out-string" select=" ."/>228 <xsl:with-param name="out-string" select="string()"/> 229 229 </xsl:call-template> 230 230 </xsl:template> … … 233 233 <xsl:param name="out-string" select="''"/> 234 234 <xsl:choose> 235 <xsl:when test="starts-with($out-string, 'make ') or 236 contains($out-string,' make ') or 237 contains($out-string,'
make')"> 238 <xsl:call-template name="output-install"> 239 <xsl:with-param 240 name="out-string" 241 select="substring-before($out-string,'make ')"/> 242 </xsl:call-template> 243 <xsl:text>make -j1 </xsl:text> 244 <xsl:call-template name="output-install"> 245 <xsl:with-param 246 name="out-string" 247 select="substring-after($out-string,'make ')"/> 248 </xsl:call-template> 249 </xsl:when> 235 250 <xsl:when test="contains($out-string,string($APOS)) 236 251 and $wrap-install = 'y'"> -
BLFS/xsl/gen_pkg_list.xsl
r77a8042 r619b313 45 45 <xsl:text>
 </xsl:text> 46 46 <name>LFS Chapter 8</name> 47 <xsl:apply-templates select='document($lfs-full)//chapter[@id="chapter-bootable"]/sect1/sect1info[./productname=" linux"]'/>47 <xsl:apply-templates select='document($lfs-full)//chapter[@id="chapter-bootable"]/sect1/sect1info[./productname="kernel"]'/> 48 48 <xsl:text>
 </xsl:text> 49 49 </sublist> … … 87 87 <xsl:choose> 88 88 <!-- Never update linux headers --> 89 <xsl:when test="./productname='linux' 90 and ancestor::chapter[@id='chapter-building-system']"/> 89 <xsl:when test="./productname='linux-headers'"/> 91 90 <!-- Gcc version is taken from BLFS --> 92 91 <xsl:when test="./productname='gcc'"/> … … 99 98 <!-- Systemd version is taken from BLFS --> 100 99 <xsl:when test="./productname='systemd'"/> 101 <!-- Same for python and ninja --> 102 <xsl:when test="./productname='ninja'"/> 100 <!-- Same for python3 --> 103 101 <xsl:when test="./productname='Python'"/> 104 102 <xsl:otherwise> -
BLFS/xsl/lfs_make_book.xsl
r77a8042 r619b313 16 16 $package='vim' or 17 17 $package='systemd' or 18 $package='ninja' or19 18 $package='Python' or 20 19 $package='shadow'"/> 20 <xsl:when test="$package='kernel'">true</xsl:when> 21 21 <xsl:when test="$package='LFS-Release'">true</xsl:when> 22 22 <xsl:otherwise> … … 36 36 $package='vim' or 37 37 $package='systemd' or 38 $package='ninja' or39 38 $package='Python' or 40 39 $package='shadow'"/> 41 <xsl:when test="$package=' linux'">40 <xsl:when test="$package='kernel'"> 42 41 <xsl:for-each select="document($lfsbook)"> 43 42 <xsl:apply-templates select="key('idlfs',$package)[ancestor::chapter/@id='chapter-bootable']" mode="lfs"/> -
BLFS/xsl/scripts.xsl
r77a8042 r619b313 72 72 73 73 <!-- simple instructions for removing .la files. --> 74 <!-- We'll use the rule that any text output begins with a linefeed if needed 75 so that we do not need to output one at the end--> 74 76 <xsl:variable name="la-files-instr"> 75 77 … … 78 80 ! -path \*ImageMagick\* \ 79 81 -delete 80 done 81 82 </xsl:variable> 82 done</xsl:variable> 83 83 84 84 <xsl:variable name="list-stat-norm" … … 103 103 104 104 <xsl:template match="sect1"> 105 106 <!-- Are stat requested for this page? --> 107 <xsl:variable name="want-stats" 108 select="contains($list-stat-norm, 109 concat(' ',@id,' '))"/> 105 110 106 111 <!-- The file names --> … … 139 144 set -e 140 145 unset MAKELEVEL 146 </xsl:text> 141 147 <!-- the above is needed for some packages --> 142 </xsl:text>143 148 <xsl:choose> 144 149 <!-- Package page --> … … 147 152 if using package management (see envars.conf), so 148 153 "export" it --> 149 <xsl:text>export JH_PKG_DIR=</xsl:text> 154 <xsl:text> 155 export JH_PKG_DIR=</xsl:text> 150 156 <xsl:value-of select="$filename"/> 151 157 <xsl:text> … … 154 160 mkdir -p $SRC_DIR 155 161 mkdir -p $BUILD_DIR 156 157 162 </xsl:text> 158 163 159 164 <!-- If stats are requested, include some definitions and intitializations --> 160 <xsl:if test="contains($list-stat-norm,concat(' ',@id,' '))"> 161 <xsl:text>INFOLOG=$(pwd)/info-${JH_PKG_DIR} 165 <xsl:if test="$want-stats"> 166 <xsl:text> 167 INFOLOG=$(pwd)/info-${JH_PKG_DIR} 162 168 TESTLOG=$(pwd)/test-${JH_PKG_DIR} 163 169 unset MAKEFLAGS … … 167 173 PKG_DEST=${BUILD_DIR}/dest 168 174 rm -rf $PKG_DEST 169 170 175 </xsl:text> 171 176 </xsl:if> 172 177 <!-- Download code and build commands --> 173 <xsl:apply-templates select="sect2"/> 178 <xsl:apply-templates select="sect2"> 179 <xsl:with-param name="want-stats" select="$want-stats"/> 180 </xsl:apply-templates> 174 181 <!-- Clean-up --> 175 <xsl:text>cd $BUILD_DIR 182 <xsl:text> 183 184 cd $BUILD_DIR 176 185 [[ -n "$JH_KEEP_FILES" ]] || </xsl:text> 177 186 <!-- In some case, some files in the build tree are owned … … 180 189 <xsl:text>sudo </xsl:text> 181 190 </xsl:if> 182 <xsl:text>rm -rf $JH_UNPACKDIR unpacked

</xsl:text> 191 <xsl:text>rm -rf $JH_UNPACKDIR unpacked 192 </xsl:text> 183 193 </xsl:when> 184 194 <!-- Non-package page --> … … 187 197 </xsl:otherwise> 188 198 </xsl:choose> 189 <xsl:text>exit</xsl:text> 199 <xsl:text> 200 exit 201 </xsl:text><!-- include a \n at the end of document--> 190 202 </exsl:document> 191 203 </xsl:template> … … 194 206 195 207 <xsl:template match="sect2"> 208 <xsl:param name="want-stats" select="false"/> 196 209 <xsl:choose> 197 210 198 211 <xsl:when test="@role = 'package'"> 199 <xsl:text> cd $SRC_DIR200 </xsl:text>212 <xsl:text> 213 cd $SRC_DIR</xsl:text> 201 214 <!-- Download information is in bridgehead tags --> 202 215 <xsl:apply-templates select="bridgehead[@renderas='sect3']"/> 203 <xsl:text>
</xsl:text>204 216 </xsl:when><!-- @role="package" --> 205 217 … … 216 228 </xsl:if> 217 229 <xsl:text>rm -rf 218 219 </xsl:text> 220 <!-- If stats are requested, insert the start size --> 221 <xsl:if test="contains($list-stat-norm,concat(' ',../@id,' '))"> 222 <xsl:text>echo Start Size: $(sudo du -skx --exclude home /) >> $INFOLOG 223 230 </xsl:text> 231 <!-- If stats are requested, insert the start size --> 232 <xsl:if test="$want-stats"> 233 <xsl:text> 234 echo Start Size: $(sudo du -skx --exclude home /) >> $INFOLOG 224 235 </xsl:text> 225 236 </xsl:if> 226 237 227 <xsl:text>case $PACKAGE in 238 <xsl:text> 239 case $PACKAGE in 228 240 *.tar.gz|*.tar.bz2|*.tar.xz|*.tgz|*.tar.lzma) 229 241 tar -xvf $SRC_DIR/$PACKAGE > unpacked … … 248 260 mkdir $JH_UNPACKDIR 249 261 cp $SRC_DIR/$PACKAGE $JH_UNPACKDIR 250 cp $(find . -mindepth 1 -maxdepth 1 -type l) $JH_UNPACKDIR 262 ADDITIONAL="$(find . -mindepth 1 -maxdepth 1 -type l)" 263 if [ -n "$ADDITIONAL" ]; then 264 cp $ADDITIONAL $JH_UNPACKDIR 265 fi 251 266 ;; 252 267 esac 253 268 export JH_UNPACKDIR 254 cd $JH_UNPACKDIR 
255 </xsl:text> 256 <!-- If stats are requested, insert the start time -->257 <xsl:if test=" contains($list-stat-norm,concat(' ',../@id,' '))">258 <xsl:text> echo Start Time: ${SECONDS} >> $INFOLOG259 269 cd $JH_UNPACKDIR 270 </xsl:text> 271 <!-- If stats are requested, insert the start time --> 272 <xsl:if test="$want-stats"> 273 <xsl:text> 274 echo Start Time: ${SECONDS} >> $INFOLOG 260 275 </xsl:text> 261 276 </xsl:if> … … 265 280 select=".//screen[not(@role = 'nodump') and ./userinput] | 266 281 .//para/command[contains(text(),'check') or 267 contains(text(),'test')]"/> 282 contains(text(),'test')]"> 283 <xsl:with-param name="want-stats" select="$want-stats"/> 284 </xsl:apply-templates> 285 <xsl:text> 286 </xsl:text> 268 287 <xsl:if test="$sudo = 'y'"> 269 288 <xsl:text>sudo /sbin/</xsl:text> 270 289 </xsl:if> 271 <xsl:text>ldconfig 

</xsl:text>290 <xsl:text>ldconfig</xsl:text> 272 291 </xsl:when><!-- @role="installation" --> 273 292 274 293 <xsl:when test="@role = 'configuration'"> 294 <xsl:text>
</xsl:text> 275 295 <xsl:apply-templates mode="config" 276 296 select=".//screen[not(@role = 'nodump') and ./userinput]"/> … … 368 388 <xsl:text> 369 389 fi 370 fi 371 </xsl:text> 390 fi</xsl:text> 372 391 <xsl:if test="string-length($md5) > 10"> 373 <xsl:text>echo "</xsl:text> 392 <xsl:text> 393 echo "</xsl:text> 374 394 <xsl:value-of select="$md5"/> 375 395 <xsl:text>  $</xsl:text> 376 396 <xsl:value-of select="$varname"/> 377 <xsl:text>" | md5sum -c - 378 </xsl:text> 397 <xsl:text>" | md5sum -c -</xsl:text> 379 398 </xsl:if> 380 399 <!-- link additional packages into $BUILD_DIR, because they are supposed to 381 400 be there--> 382 401 <xsl:if test="string($varname) != 'PACKAGE'"> 383 <xsl:text>[[ "$SRC_DIR" != "$BUILD_DIR" ]] && ln -sf $SRC_DIR/$</xsl:text> 402 <xsl:text> 403 [[ "$SRC_DIR" != "$BUILD_DIR" ]] && ln -sf $SRC_DIR/$</xsl:text> 384 404 <xsl:value-of select="$varname"/> 385 <xsl:text> $BUILD_DIR 386 </xsl:text> 405 <xsl:text> $BUILD_DIR</xsl:text> 387 406 </xsl:if> 407 <xsl:text>
</xsl:text> 388 408 </xsl:template> 389 409 … … 546 566 </xsl:if> 547 567 <xsl:apply-templates mode="root"/> 548 <xsl:text>
</xsl:text>549 568 <xsl:if test="not(following-sibling::screen[1][@role='root'])"> 550 569 <xsl:call-template name="end-root"/> … … 554 573 <xsl:otherwise> 555 574 <xsl:apply-templates select="userinput"/> 556 <xsl:text>
</xsl:text>557 575 </xsl:otherwise> 558 576 </xsl:choose> … … 562 580 <xsl:param name="bootpkg" select="'bootscripts'"/> 563 581 <xsl:param name="url" select="''"/> 564 <xsl:text>BOOTPKG_DIR=blfs-</xsl:text> 582 <xsl:text> 583 BOOTPKG_DIR=blfs-</xsl:text> 565 584 <xsl:copy-of select="$bootpkg"/> 566 585 <xsl:text> 586 567 587 BOOTSRC_DIR=${JH_SRC_ARCHIVE}${JH_SRC_SUBDIRS:+/${BOOTPKG_DIR}} 568 588 BOOTBUILD_DIR=${JH_BUILD_ROOT}${JH_BUILD_SUBDIRS:+/${BOOTPKG_DIR}} … … 595 615 BOOTUNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'` 596 616 fi 597 cd $BOOTUNPACKDIR 598 </xsl:text> 617 cd $BOOTUNPACKDIR</xsl:text> 599 618 </xsl:template> 600 619 … … 603 622 <!-- if the preceding "screen" tag is role="root", and we are role="root" 604 623 the end-root has not been called. So do it --> 605 <xsl:if test="preceding-sibling::screen[1][@role='root'] and606 624 <xsl:if 625 test="preceding-sibling::screen[1][@role='root'] and @role='root'"> 607 626 <xsl:call-template name="end-root"/> 608 627 </xsl:if> … … 614 633 <!-- if the preceding "screen" tag is role="root", and we are role="root" 615 634 the begin-root will not be called. So do it --> 616 <xsl:if test="preceding-sibling::screen[1][@role='root'] and617 635 <xsl:if 636 test="preceding-sibling::screen[1][@role='root'] and @role='root'"> 618 637 <xsl:call-template name="begin-root"/> 619 638 </xsl:if> … … 622 641 <!-- if the preceding "screen" tag is role="root", and we are role="root" 623 642 the end-root has not been called. So do it --> 624 <xsl:if test="preceding-sibling::screen[1][@role='root'] and625 643 <xsl:if 644 test="preceding-sibling::screen[1][@role='root'] and @role='root'"> 626 645 <xsl:call-template name="end-root"/> 627 646 </xsl:if> … … 633 652 <!-- if the preceding "screen" tag is role="root", and we are role="root" 634 653 the begin-root will not be called. So do it --> 635 <xsl:if test="preceding-sibling::screen[1][@role='root'] and636 654 <xsl:if 655 test="preceding-sibling::screen[1][@role='root'] and @role='root'"> 637 656 <xsl:call-template name="begin-root"/> 638 657 </xsl:if> … … 643 662 <!-- if the next "screen" tag is role="root", and we are role="root" 644 663 the end-root has not been called. So do it --> 645 <xsl:if test="following-sibling::screen[1][@role='root'] and646 664 <xsl:if 665 test="following-sibling::screen[1][@role='root'] and @role='root'"> 647 666 <xsl:call-template name="end-root"/> 648 667 </xsl:if> 649 <xsl:text> popd650 </xsl:text>668 <xsl:text> 669 popd</xsl:text> 651 670 <!-- if the next "screen" tag is role="root", and we are role="root" 652 671 the begin-root will not be called. So do it --> 653 <xsl:if test="following-sibling::screen[1][@role='root'] and654 672 <xsl:if 673 test="following-sibling::screen[1][@role='root'] and @role='root'"> 655 674 <xsl:call-template name="begin-root"/> 656 675 </xsl:if> … … 659 678 660 679 <xsl:template match="command" mode="installation"> 680 <xsl:param name="want-stats" select="false"/> 661 681 <xsl:variable name="ns" select="normalize-space(string())"/> 662 682 <xsl:variable name="first" … … 671 691 contains(text(),'test')]))"/> 672 692 <xsl:choose> 673 <xsl:when test="contains($list-stat-norm, 674 concat(' ',ancestor::sect1/@id,' '))"> 693 <xsl:when test="$want-stats"> 675 694 <xsl:if test="$first"> 676 695 <xsl:text> 696 677 697 echo Time after make: ${SECONDS} >> $INFOLOG 678 698 echo Size after make: $(sudo du -skx --exclude home /) >> $INFOLOG … … 683 703 </xsl:when> 684 704 <xsl:otherwise> 685 <xsl:text>#</xsl:text> 705 <xsl:text> 706 #</xsl:text> 686 707 </xsl:otherwise> 687 708 </xsl:choose> … … 699 720 </xsl:otherwise> 700 721 </xsl:choose> 701 <xsl:if test="contains($list-stat-norm, 702 concat(' ',ancestor::sect1/@id,' '))"> 722 <xsl:if test="$want-stats"> 703 723 <xsl:text> >> $TESTLOG 2>&1</xsl:text> 704 724 </xsl:if> 705 <xsl:text> || true
</xsl:text> 706 <xsl:if test="contains($list-stat-norm, 707 concat(' ',ancestor::sect1/@id,' ')) and $last"> 725 <xsl:text> || true</xsl:text> 726 <xsl:if test="$want-stats"> 708 727 <xsl:text> 728 709 729 echo Time after test: ${SECONDS} >> $INFOLOG 710 730 echo Size after test: $(sudo du -skx --exclude home /) >> $INFOLOG 711 731 echo Time before install: ${SECONDS} >> $INFOLOG 712 713 732 </xsl:text> 714 733 </xsl:if> … … 716 735 717 736 <xsl:template match="userinput"> 737 <xsl:text> 738 </xsl:text> 718 739 <xsl:apply-templates/> 740 </xsl:template> 741 742 <xsl:template match="userinput" mode="root"> 743 <xsl:text> 744 </xsl:text> 745 <xsl:apply-templates mode="root"/> 719 746 </xsl:template> 720 747 … … 734 761 <xsl:param name="out-string" select="''"/> 735 762 <xsl:choose> 736 <xsl:when test="contains($out-string,'make ')">737 <xsl:call-template name="output-root">738 <xsl:with-param name="out-string"739 select="substring-before($out-string,'make ')"/>740 </xsl:call-template>741 <xsl:text>make -j1 </xsl:text>742 <xsl:call-template name="output-root">743 <xsl:with-param name="out-string"744 select="substring-after($out-string,'make ')"/>745 </xsl:call-template>746 </xsl:when>747 763 <xsl:when test="contains($out-string,'$') and $sudo = 'y'"> 748 764 <xsl:call-template name="output-root"> … … 852 868 mode="destdir"/> 853 869 <xsl:text> 870 854 871 echo Time after install: ${SECONDS} >> $INFOLOG 855 872 echo Size after install: $(sudo du -skx --exclude home /) >> $INFOLOG … … 874 891 </xsl:otherwise> 875 892 </xsl:choose> 876 <xsl:text>
</xsl:text>877 893 </xsl:template> 878 894 … … 895 911 </xsl:when> 896 912 <xsl:otherwise> 897 <xsl:text>make DESTDIR=$PKG_DEST</xsl:text> 913 <xsl:text> 914 make DESTDIR=$PKG_DEST</xsl:text> 898 915 <xsl:call-template name="outputpkgdest"> 899 916 <xsl:with-param … … 919 936 </xsl:when> 920 937 <xsl:otherwise> 921 <xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text> 938 <xsl:text> 939 DESTDIR=$PKG_DEST ninja</xsl:text> 922 940 <xsl:call-template name="outputpkgdest"> 923 941 <xsl:with-param … … 985 1003 <xsl:text> &&</xsl:text> 986 1004 </xsl:if> 987 <xsl:text>
</xsl:text> 1005 <xsl:text> 1006 </xsl:text> 988 1007 <xsl:call-template name="remove-ampersand"> 989 1008 <xsl:with-param name="out-string" … … 1017 1036 <xsl:param name="instructions" select="''"/> 1018 1037 <xsl:choose> 1019 <xsl:when test="contains($instructions,'
')"> 1020 <xsl:copy-of select="substring-before($instructions,'
')"/> 1021 <xsl:text>
</xsl:text> 1038 <xsl:when 1039 test="substring($instructions,string-length($instructions))=' '"> 1022 1040 <xsl:call-template name="remove-end-space"> 1023 1041 <xsl:with-param 1024 1042 name="instructions" 1025 select="substring-after($instructions,'
')"/> 1026 </xsl:call-template> 1027 </xsl:when> 1028 <xsl:otherwise> 1029 <xsl:copy-of select="normalize-space($instructions)"/> 1043 select="substring($instructions, 1044 1, 1045 string-length($instructions)-1)"/> 1046 </xsl:call-template> 1047 </xsl:when> 1048 <xsl:otherwise> 1049 <xsl:copy-of select="$instructions"/> 1030 1050 </xsl:otherwise> 1031 1051 </xsl:choose>
Note:
See TracChangeset
for help on using the changeset viewer.