From: Martin Mares Date: Thu, 18 Oct 2007 11:11:53 +0000 (+0200) Subject: Oprava skriptiku pro uploadovani na server. X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=fc12bb57ca44a624bd36ee77633b6df05d292912;p=ads2.git Oprava skriptiku pro uploadovani na server. --- diff --git a/Makerules b/Makerules index 01e71fa..c2a6492 100644 --- a/Makerules +++ b/Makerules @@ -29,7 +29,7 @@ clean:: mostlyclean ifndef CUSTOM_UPLOAD upload:: make $P-booklet.ps - scp -C $P-booklet.ps jabberwock:www/vyuka/0607/ads1/$P-booklet.ps + scp -C $P-booklet.ps jabberwock:www/vyuka/0708/ads2/$P-booklet.ps endif .SECONDARY: diff --git a/all/ChangeLog b/all/ChangeLog index 86684b9..ec90c41 100644 --- a/all/ChangeLog +++ b/all/ChangeLog @@ -1,102 +1,6 @@ -commit a748943564adddb47dd0f5fb8d7685d77b6f148b +commit 81383c3b1ab213e35aaaf31e18368dde88b75656 Author: Martin Mares -Date: Wed Oct 3 18:54:11 2007 +0200 +Date: Thu Oct 18 13:06:31 2007 +0200 - Stare GIFyzruseny. + Prvni verze druhe prednasky. - 7-stromy/Insert1.gif | Bin - 7-stromy/ab-strom11.gif | Bin - 7-stromy/b-klicu1.gif | Bin - 7-stromy/b-klicu2.gif | Bin - 7-stromy/delete21.gif | Bin - 7-stromy/delete22.gif | Bin - 7-stromy/delete31.gif | Bin - 7-stromy/delete32.gif | Bin - 8 files changed, 0 insertions(+), 0 deletions(-) - -commit 8d771d9e18da7c1b336923267ce53d3c2856405e -Author: Martin Mares -Date: Wed Oct 3 18:53:49 2007 +0200 - - GIFy zkonvertovany do PNG, ale jeste nejsou do textu zasazeny. - - 7-stromy/abpic/Insert1.png | Bin - 7-stromy/abpic/ab-strom11.png | Bin - 7-stromy/abpic/b-klicu1.png | Bin - 7-stromy/abpic/b-klicu2.png | Bin - 7-stromy/abpic/delete21.png | Bin - 7-stromy/abpic/delete22.png | Bin - 7-stromy/abpic/delete31.png | Bin - 7-stromy/abpic/delete32.png | Bin - 8 files changed, 0 insertions(+), 0 deletions(-) - -commit 6f4264dc0df979701be869585dbfb87f21603750 -Author: Martin Mares -Date: Wed Oct 3 18:41:16 2007 +0200 - - Pribyly obrazky stromu z Programatorske kucharky KSP. - - 7-stromy/7-stromy.tex | 51 ++- - 7-stromy/treepic/t1.ipe | 299 ++++++++++++++++++ - 7-stromy/treepic/t10.ipe | 389 +++++++++++++++++++++++ - 7-stromy/treepic/t11.ipe | 398 ++++++++++++++++++++++++ - 7-stromy/treepic/t12.ipe | 566 ++++++++++++++++++++++++++++++++++ - 7-stromy/treepic/t12y.ipe | 565 ++++++++++++++++++++++++++++++++++ - 7-stromy/treepic/t13.ipe | 706 ++++++++++++++++++++++++++++++++++++++++++ - 7-stromy/treepic/t2.ipe | 465 ++++++++++++++++++++++++++++ - 7-stromy/treepic/t3.ipe | 749 +++++++++++++++++++++++++++++++++++++++++++++ - 7-stromy/treepic/t35.ipe | 357 +++++++++++++++++++++ - 7-stromy/treepic/t4.ipe | 424 +++++++++++++++++++++++++ - 7-stromy/treepic/t5.ipe | 540 ++++++++++++++++++++++++++++++++ - 7-stromy/treepic/t6.ipe | 460 ++++++++++++++++++++++++++++ - 7-stromy/treepic/t7.ipe | 398 ++++++++++++++++++++++++ - 7-stromy/treepic/t8.ipe | 579 +++++++++++++++++++++++++++++++++++ - 7-stromy/treepic/t9.ipe | 705 ++++++++++++++++++++++++++++++++++++++++++ - mjipe.tex | 54 +++ - 17 files changed, 7687 insertions(+), 18 deletions(-) - -commit 9a1e7f0e7ec9c6b095a9618363d451adead3dfae -Author: Martin Mares -Date: Wed Oct 3 18:24:06 2007 +0200 - - Stromy: Vycisteni TeXoveho zdrojaku a konverze cestiny. - - 7-stromy/7-stromy.tex | 234 ++++++++++++++++++++++--------------------------- - 1 files changed, 104 insertions(+), 130 deletions(-) - -commit 27980ec9b68061c681223cf6810ca9f9e856c852 -Merge: c62dbac... a561fef... -Author: Martin Mares -Date: Wed Oct 3 13:16:20 2007 +0200 - - Merge with git+ssh://git.ucw.cz/home/mj/GIT/ads.git - - -commit c62dbac4555b0bd8da14c589cab3980819f4e7c2 -Author: Martin Mares -Date: Wed Oct 3 13:16:09 2007 +0200 - - Prvni nastrel. - - 7-stromy/7-stromy.tex | 274 +++++++++++++++++++++++++++++++++++++++++++++++ - 7-stromy/Insert1.gif | Bin - 7-stromy/Makefile | 3 + - 7-stromy/ab-strom11.gif | Bin - 7-stromy/b-klicu1.gif | Bin - 7-stromy/b-klicu2.gif | Bin - 7-stromy/delete21.gif | Bin - 7-stromy/delete22.gif | Bin - 7-stromy/delete31.gif | Bin - 7-stromy/delete32.gif | Bin - 10 files changed, 277 insertions(+), 0 deletions(-) - -commit a561fefca56a6c81337695440a55448e734b5e2e -Author: Martin Mares -Date: Mon Oct 1 00:25:57 2007 +0200 - - Pridana nulta verze Dijkstrova algoritmu. - - 11-dijkstra/11-dijkstra.tex | 162 +++++++++++++++++++++++++++++++++++++++++++ - 11-dijkstra/Makefile | 3 + - all/Makefile | 2 - - 3 files changed, 166 insertions(+), 1 deletions(-) diff --git a/all/Makefile b/all/Makefile index 9c4b409..9cc7731 100644 --- a/all/Makefile +++ b/all/Makefile @@ -1,12 +1,12 @@ -P=ads -X:=$(shell for a in 1 2 3 4 5 6 8 9 10 11 12 13 ; do echo ../$$a-*/$$a-*.tex ; done) +P=ads2 +X:=$(shell for a in 2 ; do echo ../$$a-*/$$a-*.tex ; done) %universe: all ChangeLog CUSTOM_UPLOAD=1 include ../Makerules -ads.dvi: ads.tex body.tex +ads2.dvi: ads2.tex body.tex body.tex: $(X) preprocess ./preprocess $(X) >$@ @@ -19,7 +19,7 @@ clean:: upload:: make $P.ps $P-2in1.ps - scp -C $P.ps $P-2in1.ps jabberwock:www/vyuka/0607/ads1/ + scp -C $P.ps $P-2in1.ps jabberwock:www/vyuka/0708/ads2/ ( cd .. && make clean ) - ( cd ../.. && tar czf - --exclude .git ads ) | ssh jabberwock 'cd www/vyuka/0607/ads1/ && cat >ads.tar.gz.new && mv ads.tar.gz.new ads.tar.gz' - make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/0607/ads1 && cat >ChangeLog.new && mv ChangeLog.new ChangeLog' + ( cd ../.. && tar czf - --exclude .git ads2 ) | ssh jabberwock 'cd www/vyuka/0708/ads2/ && cat >ads2.tar.gz.new && mv ads2.tar.gz.new ads2.tar.gz' + make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/0708/ads2 && cat >ChangeLog.new && mv ChangeLog.new ChangeLog' diff --git a/all/ads.tex b/all/ads.tex deleted file mode 100644 index 419ff8f..0000000 --- a/all/ads.tex +++ /dev/null @@ -1,7 +0,0 @@ -\input ../lecnotes.tex - -\def\chapterend{\bigbreak\bigbreak} - -\input body.tex - -\bye diff --git a/all/ads2.tex b/all/ads2.tex new file mode 100644 index 0000000..419ff8f --- /dev/null +++ b/all/ads2.tex @@ -0,0 +1,7 @@ +\input ../lecnotes.tex + +\def\chapterend{\bigbreak\bigbreak} + +\input body.tex + +\bye