Changeset 6d3005f


Ignore:
Timestamp:
08/07/2014 09:20:13 AM (7 years ago)
Author:
Igor Živković <igor@…>
Branches:
10.0, 10.1, 11.0, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, krejzi/svn, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
6f88eb2
Parents:
c41b38f
Message:

revert some accidentally pulled changes from my environment

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13848 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rc41b38f r6d3005f  
    22# By Tushar Teredesai <tushar@linuxfromscratch.org>
    33# 2004-01-31
     4# $LastChangedBy$
     5# $Date$
    46
    57# Adjust these to suit your installation
    68BASEDIR ?= $(HOME)/public_html/blfs-book-xsl
    79DUMPDIR ?= $(HOME)/blfs-commands
    8 RENDERTMP ?= /tmp
     10RENDERTMP ?= tmp
    911CHUNK_QUIET = 1
    1012ROOT_ID =
     13#PDF_OUTPUT = BLFS-BOOK.pdf
    1114NOCHUNKS_OUTPUT = BLFS-BOOK.html
    12 SHELL = /bin/sh
     15SHELL = /bin/bash
    1316
    1417ALLXML := $(filter-out $(RENDERTMP)/%, \
     
    2427
    2528blfs: html wget-list
     29#all: blfs nochunks pdf
    2630all: blfs nochunks
    2731world: all blfs-patch-list dump-commands test-links
     
    5054          tidy -config tidy.conf $$filename; \
    5155          true; \
    52           sh obfuscate.sh $$filename; \
     56          bash obfuscate.sh $$filename; \
    5357          sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
    5458        done;
     59
     60#pdf: $(BASEDIR)/$(PDF_OUTPUT)
     61#$(RENDERTMP)/blfs-pdf.xml: $(RENDERTMP)/blfs-full.xml
     62#       @echo "Generating profiled XML for PDF..."
     63#       $(Q)xsltproc --nonet --stringparam profile.condition pdf \
     64          --output $(RENDERTMP)/blfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
     65          $(RENDERTMP)/blfs-full.xml
     66
     67#$(RENDERTMP)/blfs-pdf.fo: $(RENDERTMP)/blfs-pdf.xml
     68#       @echo "Generating FO file..."
     69#       $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
     70          --output $(RENDERTMP)/blfs-pdf.fo stylesheets/blfs-pdf.xsl \
     71          $(RENDERTMP)/blfs-pdf.xml
     72#       $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/blfs-pdf.fo
     73
     74#$(BASEDIR)/$(PDF_OUTPUT): $(RENDERTMP)/blfs-pdf.fo
     75#       @echo "Generating PDF file..."
     76#       $(Q)if [ ! -e $(BASEDIR) ]; then \
     77          mkdir -p $(BASEDIR); \
     78        fi;
     79#       $(Q)fop $(RENDERTMP)/blfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
    5580
    5681nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
     
    75100        @echo "Cleaning $(RENDERTMP)"
    76101        $(Q)rm -f $(RENDERTMP)/blfs-{full,html}.xml
     102#       $(Q)rm -f $(RENDERTMP)/blfs-{full,html,pdf}.xml
     103#       $(Q)rm -f $(RENDERTMP)/blfs-pdf.fo
    77104        $(Q)rm -f $(RENDERTMP)/blfs-{patch-list,patches}
    78105        $(Q)rmdir $(RENDERTMP) 2>/dev/null || :
     
    134161        done
    135162
     163bootscripts:
     164        @VERSION=`grep "bootscripts-version " general.ent | cut -d\" -f2`; \
     165   BOOTSCRIPTS="blfs-bootscripts-$$VERSION"; \
     166   if [ ! -e $$BOOTSCRIPTS.tar.xz ]; then \
     167     rm -rf $(RENDERTMP)/$$BOOTSCRIPTS; \
     168     mkdir $(RENDERTMP)/$$BOOTSCRIPTS; \
     169     cp -a ../bootscripts/* $(RENDERTMP)/$$BOOTSCRIPTS; \
     170     rm -rf ../bootscripts/archive; \
     171     tar  -cJhf $$BOOTSCRIPTS.tar.xz -C $(RENDERTMP) $$BOOTSCRIPTS; \
     172   fi
     173
    136174dump-commands: $(DUMPDIR)
    137175$(DUMPDIR): $(RENDERTMP)/blfs-full.xml
     
    146184
    147185.PHONY: blfs all world html nochunks tmpdir clean validxml \
     186        profile-html wget-list test-links dump-commands validate \
     187   bootscripts
     188
     189#.PHONY: blfs all world html pdf nochunks tmpdir clean validxml \
    148190        profile-html wget-list test-links dump-commands validate
  • obfuscate.sh

    rc41b38f r6d3005f  
    1 #!/bin/sh
     1#!/bin/bash
     2
     3# $LastChangedBy$
     4# $Date$
    25
    36# obfuscate.sh
     
    3134  link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
    3235  plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
    33   cp ${1} ${1}.tmp
     36  cp ${1}{,.tmp}
    3437  sed -e "s|mailto:$i|mailto:$link|" \
    3538      -e "s|$i|$plaintext|" ${1}.tmp > ${1}
Note: See TracChangeset for help on using the changeset viewer.