[svn-commits] mvanbaak: branch 1.6.0 r130582 - in /branches/1.6.0: ./ build_tools/ doc/tex/...

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sun Jul 13 18:20:11 2008
New Revision: 130582

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130582
Log:
Merged revisions 130578 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r130578 | mvanbaak | 2008-07-14 01:14:03 +0200 (Mon, 14 Jul 2008) | 15 lines

Make all sed calls Posix sed compatible.
To make sure nobody commits script-modified files we first make a backup
of asterisk.tex, run the script, generate the pdf and / or html,
and put the original asterisk.tex back.
This will guard us for the stuff that happened before that someone committed 
a locally modified asterisk.tex, with changes done by this script.

(closes issue #13062)
Reported by: mvanbaak
Patches:
      sed_without-i-v3.diff uploaded by mvanbaak (license 7)
Tested by: mvanbaak

Feedback from Corydon. Thanks for taking the time to go through this.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/prep_tarball
    branches/1.6.0/doc/tex/Makefile
    branches/1.6.0/res/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/prep_tarball?view=diff&rev=130582&r1=130581&r2=130582
==============================================================================
--- branches/1.6.0/build_tools/prep_tarball (original)
+++ branches/1.6.0/build_tools/prep_tarball Sun Jul 13 18:20:11 2008
@@ -9,5 +9,10 @@
 make AWK=awk GREP=grep menuselect-tree
 
 VERSION=`cat .version`
-sed -i -e "s/ASTERISKVERSION/${VERSION}/" doc/tex/asterisk.tex
+# make backup of asterisk.tex because we are going to alter it
+cp asterisk.tex asterisk.tex.orig
+sed -e "s/ASTERISKVERSION/${VERSION}/" doc/tex/asterisk.tex > doc/tex/asterisk_local.tex
+mv asterisk_local.tex asterisk.tex
 cd doc/tex && rubber --pdf asterisk.tex && latex2html asterisk.tex
+# restore backup of asterisk.tex
+mv asterisk.tex.orig asterisk.tex

Modified: branches/1.6.0/doc/tex/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/doc/tex/Makefile?view=diff&rev=130582&r1=130581&r2=130582
==============================================================================
--- branches/1.6.0/doc/tex/Makefile (original)
+++ branches/1.6.0/doc/tex/Makefile Sun Jul 13 18:20:11 2008
@@ -24,7 +24,8 @@
 endif
 endif
 	@cp asterisk.tex asterisk.tex.orig
-	sed -i -e 's/ASTERISKVERSION/$(shell echo $(ASTERISKVERSION) | sed -e 's/\//\\\//g')/' asterisk.tex
+	@sed -e 's/ASTERISKVERSION/$(shell echo $(ASTERISKVERSION) | sed -e 's/\//\\\//g')/' asterisk.tex > asterisk_local.tex
+	@mv asterisk_local.tex asterisk.tex
 	@$(RUBBER) --pdf asterisk.tex
 	@mv asterisk.tex.orig asterisk.tex
 endif
@@ -38,7 +39,8 @@
 	@echo "** required for this to work.              ***"	
 	@echo "**********************************************"
 	@cp asterisk.tex asterisk.tex.orig
-	@sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' asterisk.tex
+	@sed -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' asterisk.tex > asterisk_local.tex
+	@mv asterisk_local.tex asterisk.tex
 	@latex2html asterisk.tex
 	@mv asterisk.tex.orig asterisk.tex
 

Modified: branches/1.6.0/res/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/Makefile?view=diff&rev=130582&r1=130581&r2=130582
==============================================================================
--- branches/1.6.0/res/Makefile (original)
+++ branches/1.6.0/res/Makefile Sun Jul 13 18:20:11 2008
@@ -40,7 +40,7 @@
 $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o
 
 ael/ael_lex.c:
-	(cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c)
+	(cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
 	(cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
 
 ael/ael.tab.c ael/ael.tab.h: