[5207] | 1 | diff -up texlive-2011/tl11/common.sh.vine texlive-2011/tl11/common.sh |
---|
| 2 | --- texlive-2011/tl11/common.sh.vine 2011-11-20 15:49:23.000000000 +0900 |
---|
| 3 | +++ texlive-2011/tl11/common.sh 2011-11-23 16:32:00.545511134 +0900 |
---|
| 4 | @@ -7,29 +7,48 @@ |
---|
| 5 | TLSRCDIR=/opt/home-supp/tl11 |
---|
| 6 | |
---|
| 7 | # temporaly working directory |
---|
| 8 | -TMPDIR=/tmp |
---|
| 9 | +TMPDIR=$(dirname ${TLSRCDIR})/build |
---|
| 10 | #TMPDIR=/var/tmp |
---|
| 11 | |
---|
| 12 | # the place of installed TeX Live |
---|
| 13 | -TLINSTDIR=/opt/texlive/2011 |
---|
| 14 | +TLINSTDIR=/usr/share/texlive-sources |
---|
| 15 | #TLINSTDIR=/mnt/cd0a |
---|
| 16 | |
---|
| 17 | # install directory |
---|
| 18 | -PREFIX=/opt/texlive/p2011 |
---|
| 19 | +PREFIX=$(dirname ${TLSRCDIR})/work |
---|
| 20 | |
---|
| 21 | # toolkit for [p]xdvi |
---|
| 22 | -#TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=motif |
---|
| 23 | -TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw |
---|
| 24 | +TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=motif |
---|
| 25 | +#TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw |
---|
| 26 | |
---|
| 27 | -TL_MAKE_FLAGS=-j3 |
---|
| 28 | +TL_MAKE_FLAGS=-j$(/usr/bin/getconf _NPROCESSORS_ONLN) |
---|
| 29 | |
---|
| 30 | TL_CONFIGURE_ARGS= |
---|
| 31 | -## The following args are for generating binaries for tlptexlive |
---|
| 32 | -#TL_CONFIGURE_ARGS="--disable-all-pkgs --enable-web2c \ |
---|
| 33 | -# --disable-xdvipdfmx --disable-xetex \ |
---|
| 34 | -# --enable-web-progs --enable-dvipdfmx --enable-mendexk \ |
---|
| 35 | -# --enable-makejvf --enable-pxdvik --enable-dvipsk \ |
---|
| 36 | -# --enable-tetex --enable-texlive " |
---|
| 37 | +## The following args are for generating binaries for Vine Linux |
---|
| 38 | +TL_CONFIGURE_ARGS=" \ |
---|
| 39 | + --enable-shared --disable-static \ |
---|
| 40 | + --enable-compiler-warnings=max \ |
---|
| 41 | + --without-cxx-runtime-hack \ |
---|
| 42 | + \ |
---|
| 43 | + --enable-web2c \ |
---|
| 44 | + --enable-web-progs --enable-dvipdfmx --enable-mendexk \ |
---|
| 45 | + --enable-makejvf --enable-pxdvik --enable-dvipsk \ |
---|
| 46 | + --enable-tetex --enable-texlive \ |
---|
| 47 | + \ |
---|
| 48 | + --with-system-xpdf \ |
---|
| 49 | + --with-system-gd \ |
---|
| 50 | + --with-system-t1lib \ |
---|
| 51 | + --with-system-libpng \ |
---|
| 52 | + --with-system-zlib \ |
---|
| 53 | + --with-system-freetype2 --with-freetype2-include=`freetype-config --cflags | sed -e 's/-I//' -e 's/ .*//'` \ |
---|
| 54 | + --with-pic \ |
---|
| 55 | + --with-xdvi-x-toolkit=motif \ |
---|
| 56 | + \ |
---|
| 57 | + --disable-xindy --disable-xindy-docs --disable-xindy-make-rules \ |
---|
| 58 | + --disable-dvi2tty \ |
---|
| 59 | + --disable-t1utils \ |
---|
| 60 | + --disable-psutils \ |
---|
| 61 | +" |
---|
| 62 | |
---|
| 63 | # for Ubuntu? |
---|
| 64 | # CONFIG_SHELL=$BASH |
---|
| 65 | @@ -38,16 +57,17 @@ TL_CONFIGURE_ARGS= |
---|
| 66 | # -------------------------------- |
---|
| 67 | unset TEXINPUTS |
---|
| 68 | unset PTEX_KANJI_ENC |
---|
| 69 | +[ -d $TMPDIR ] || mkdir -p $TMPDIR |
---|
| 70 | TLV=`basename $TLSRCDIR/texlive-*-source.tar.xz |sed "s/texlive-\(........\).*/\1/"` |
---|
| 71 | SRCDIR=$TMPDIR/texlive-$TLV-source |
---|
| 72 | echo -e "\e[0;32m *** TeX Live source: texlive-$TLV-source.tar.xz ***\e[0m" |
---|
| 73 | -ARCH=`ls $SRCDIR/inst/bin/ 2> /dev/null` |
---|
| 74 | +##ARCH=`ls $SRCDIR/inst/bin/ 2> /dev/null` |
---|
| 75 | PTEX_IN_FILTER=no |
---|
| 76 | TEXMF=$SRCDIR/inst/texmf |
---|
| 77 | XMAP=$TEXMF/fonts/map/dvipdfmx |
---|
| 78 | export TEXMFMAIN=$TEXMF |
---|
| 79 | export ORIGPATH=$PATH |
---|
| 80 | -export PATH=$SRCDIR/inst/bin/$ARCH:$PATH |
---|
| 81 | +export PATH=$SRCDIR/inst/bin:$PATH |
---|
| 82 | export TL_CONF_XDVI_TOOLKIT TL_CONFIGURE_ARGS TL_MAKE_FLAGS |
---|
| 83 | |
---|
| 84 | sedwrite(){ |
---|
| 85 | |
---|
| 86 | Diff finished. Wed Nov 23 16:32:14 2011 |
---|
| 87 | diff -up texlive-2011/tl11/scripts/texmf.sh.vine texlive-2011/tl11/scripts/texmf.sh |
---|
| 88 | --- texlive-2011/tl11/scripts/texmf.sh.vine 2011-11-20 15:48:57.000000000 +0900 |
---|
| 89 | +++ texlive-2011/tl11/scripts/texmf.sh 2011-11-26 15:33:53.791319730 +0900 |
---|
| 90 | @@ -1,4 +1,4 @@ |
---|
| 91 | -#!/bin/bash |
---|
| 92 | +#!/bin/bash -x |
---|
| 93 | |
---|
| 94 | . ./common.sh $* |
---|
| 95 | |
---|
| 96 | @@ -29,26 +29,26 @@ mv sample.* ../../../doc/platex/japanese |
---|
| 97 | mv README ../../../doc/platex/japanese/ |
---|
| 98 | cd ../../../.. |
---|
| 99 | |
---|
| 100 | -# otf package |
---|
| 101 | -tarz $TLSRCDIR/ptex/otfbeta.zip |
---|
| 102 | -#if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 103 | -# tar zxf $TLSRCDIR/uptex/otfstable-uptex-0.05.tar.gz |
---|
| 104 | -#fi |
---|
| 105 | -cd otfbeta |
---|
| 106 | -sedwrite mkjvf "s/ovp2ovf/wovp2ovf/" && chmod +x mkjvf |
---|
| 107 | -#if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 108 | -# sedwrite umkjvf "s/'ovp2ovf/'wovp2ovf/" && chmod +x umkjvf |
---|
| 109 | -#fi |
---|
| 110 | -for x in script/*.pl; do sedwrite $x "s/ovp2ovf/wovp2ovf/"; chmod +x $x; done |
---|
| 111 | -./makeotf |
---|
| 112 | -#if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 113 | -# ./umakeotf |
---|
| 114 | -#fi |
---|
| 115 | -mkdir -p ../texmf/fonts/tfm/otf && cp tfm/*.tfm ../texmf/fonts/tfm/otf/ |
---|
| 116 | -mkdir -p ../texmf/fonts/vf/otf && cp vf/*.vf ../texmf/fonts/vf/otf/ |
---|
| 117 | -mkdir -p ../texmf/tex/latex/otf && cp sty/* ../texmf/tex/latex/otf |
---|
| 118 | -cd .. |
---|
| 119 | -rm -rf otfbeta |
---|
| 120 | +# # otf package |
---|
| 121 | +# tarz $TLSRCDIR/ptex/otfbeta.zip |
---|
| 122 | +# #if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 123 | +# # tar zxf $TLSRCDIR/uptex/otfstable-uptex-0.05.tar.gz |
---|
| 124 | +# #fi |
---|
| 125 | +# cd otfbeta |
---|
| 126 | +# sedwrite mkjvf "s/ovp2ovf/wovp2ovf/" && chmod +x mkjvf |
---|
| 127 | +# #if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 128 | +# # sedwrite umkjvf "s/'ovp2ovf/'wovp2ovf/" && chmod +x umkjvf |
---|
| 129 | +# #fi |
---|
| 130 | +# for x in script/*.pl; do sedwrite $x "s/ovp2ovf/wovp2ovf/"; chmod +x $x; done |
---|
| 131 | +# ./makeotf |
---|
| 132 | +# #if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 133 | +# # ./umakeotf |
---|
| 134 | +# #fi |
---|
| 135 | +# mkdir -p ../texmf/fonts/tfm/otf && cp tfm/*.tfm ../texmf/fonts/tfm/otf/ |
---|
| 136 | +# mkdir -p ../texmf/fonts/vf/otf && cp vf/*.vf ../texmf/fonts/vf/otf/ |
---|
| 137 | +# mkdir -p ../texmf/tex/latex/otf && cp sty/* ../texmf/tex/latex/otf |
---|
| 138 | +# cd .. |
---|
| 139 | +# rm -rf otfbeta |
---|
| 140 | fi |
---|
| 141 | |
---|
| 142 | echo -e "\e[0;33m[rewriting] \e[0m updmap.cfg" |
---|
| 143 | @@ -56,7 +56,7 @@ echo "KanjiMap otf-cktx.map" >> texmf/we |
---|
| 144 | (cd $XMAP && tarz $TLSRCDIR/ptex/ptexlive-maps-????????.tar.xz) |
---|
| 145 | |
---|
| 146 | # xdvi |
---|
| 147 | -if [ -f bin/$ARCH/pxdvi ]; then |
---|
| 148 | +if [ -f bin/pxdvi ]; then |
---|
| 149 | cp ../texk/pxdvik/texmf/XDvi texmf/xdvi/XDvi |
---|
| 150 | cp ../texk/pxdvik/texmf/pxdvi.cfg texmf/xdvi/pxdvi.cfg |
---|
| 151 | cp $TLSRCDIR/xdvi-ptex.map.sample texmf/xdvi/ |
---|
| 152 | |
---|
| 153 | Diff finished. Sat Nov 26 15:34:13 2011 |
---|
| 154 | diff -up texlive-2011/tl11/scripts/build.sh.vine texlive-2011/tl11/scripts/build.sh |
---|
| 155 | --- texlive-2011/tl11/scripts/build.sh.vine 2011-11-08 15:56:41.000000000 +0900 |
---|
| 156 | +++ texlive-2011/tl11/scripts/build.sh 2011-11-23 19:08:55.313053090 +0900 |
---|
| 157 | @@ -7,8 +7,11 @@ if [ "$FLG_RP" = "TRUE" ] ;then |
---|
| 158 | zpatch 0 $TLSRCDIR/reautoconf-parallel.diff |
---|
| 159 | fi |
---|
| 160 | ./reautoconf || exit 1 # ここで時間がかかる |
---|
| 161 | -TL_MAKE=$MAKE ./Build --enable-multiplatform --disable-native-texlive-build || exit 1 |
---|
| 162 | +##TL_MAKE=$MAKE ./Build --enable-multiplatform --disable-native-texlive-build || exit 1 |
---|
| 163 | +TL_MAKE=$MAKE ./Build --disable-multiplatform --disable-native-texlive-build || exit 1 |
---|
| 164 | |
---|
| 165 | +exit 0 |
---|
| 166 | +## We run the following processes as scripts/build-post.sh. |
---|
| 167 | # |
---|
| 168 | . $TLSRCDIR/common.sh $* |
---|
| 169 | |
---|
| 170 | |
---|
| 171 | Diff finished. Wed Nov 23 19:09:01 2011 |
---|
| 172 | diff -up /dev/null texlive-2011/tl11/scripts/build-post.sh |
---|
| 173 | --- /dev/null 2011-11-23 23:03:59.948000077 +0900 |
---|
| 174 | +++ texlive-2011/tl11/scripts/build-post.sh 2011-11-23 19:10:27.848058399 +0900 |
---|
| 175 | @@ -0,0 +1,65 @@ |
---|
| 176 | +#!/bin/bash |
---|
| 177 | + |
---|
| 178 | +. ./common.sh $* |
---|
| 179 | + |
---|
| 180 | +cd $SRCDIR/inst |
---|
| 181 | +cp -r texmf texmf.orig |
---|
| 182 | +cp -r $TLINSTDIR/texmf . |
---|
| 183 | +cp -r ../texk/tetex/updmap.pl texmf/scripts/tetex/ |
---|
| 184 | +cp texmf.orig/web2c/fmtutil.cnf texmf/web2c/fmtutil.cnf |
---|
| 185 | +cp texmf.orig/web2c/texmf.cnf texmf/web2c/texmf.cnf |
---|
| 186 | +rm -rf texmf.orig |
---|
| 187 | + |
---|
| 188 | +# if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 189 | +# cd texmf |
---|
| 190 | +# zpatch 0 $TLSRCDIR/uptex/uptex-*-texmf-texlive2010.diff |
---|
| 191 | +# tarz $TLSRCDIR/uptex_font-*.tar.gz |
---|
| 192 | +# cd fonts/uptex_min/pl |
---|
| 193 | +# echo -e "\e[0;33m[building] \e[0m umin7.tfm etc." |
---|
| 194 | +# $MAKE pl5 tfm5 vf5 &>/dev/null || exit 1 |
---|
| 195 | +# cp u*.tfm ../../tfm/uptex/ |
---|
| 196 | +# cp u*.vf ../../vf/uptex/ |
---|
| 197 | +# cd ../../.. |
---|
| 198 | +# rm -rf fonts/uptex_jis fonts/uptex_upjis fonts/uptex_map fonts/uptex_min |
---|
| 199 | +# cd .. |
---|
| 200 | +# fi |
---|
| 201 | + |
---|
| 202 | +# map for dvipdfmx |
---|
| 203 | +sedwrite texmf/dvipdfmx/dvipdfmx.cfg "s/cid-x.map/kanjix.map/" |
---|
| 204 | +echo -e "\e[0;33m[rewriting] \e[0m updmap.cfg" |
---|
| 205 | +cat <<EOF >> texmf/web2c/updmap.cfg || exit |
---|
| 206 | +# |
---|
| 207 | +# map for pTeX |
---|
| 208 | +KanjiMap morisawa.map |
---|
| 209 | +EOF |
---|
| 210 | + |
---|
| 211 | + |
---|
| 212 | +ln -s $TLINSTDIR/tlpkg tlpkg |
---|
| 213 | + |
---|
| 214 | +exit 0 |
---|
| 215 | + |
---|
| 216 | + |
---|
| 217 | +###### |
---|
| 218 | +if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 219 | + echo -e "\e[0;33m[rewriting] \e[0m updmap.cfg" |
---|
| 220 | + echo "KanjiMap uptex-ckt.map" >> texmf/web2c/updmap.cfg || exit |
---|
| 221 | + echo -e "\e[0;33m[writing] \e[0m uptex-ckt.map" |
---|
| 222 | + cat <<EOF > $XMAP/uptex-ckt.map |
---|
| 223 | +%% |
---|
| 224 | +%% Chinese/Korean fonts for upTeX |
---|
| 225 | +%% |
---|
| 226 | +upstsl-h UniGB-UTF16-H !STSong-Light |
---|
| 227 | +upstsl-v UniGB-UTF16-V !STSong-Light |
---|
| 228 | +upstht-h UniGB-UTF16-H !STHeiti-Regular |
---|
| 229 | +upstht-v UniGB-UTF16-V !STHeiti-Regular |
---|
| 230 | +upmsl-h UniCNS-UTF16-H !MSung-Light |
---|
| 231 | +upmsl-v UniCNS-UTF16-V !MSung-Light |
---|
| 232 | +upmhm-h UniCNS-UTF16-H !MHei-Medium |
---|
| 233 | +upmhm-v UniCNS-UTF16-V !MHei-Medium |
---|
| 234 | +uphysmjm-h UniKS-UTF16-H !HYSMyeongJo-Medium |
---|
| 235 | +uphysmjm-v UniKS-UTF16-V !HYSMyeongJo-Medium |
---|
| 236 | +uphygt-h UniKS-UTF16-H !HYGoThic-Medium |
---|
| 237 | +uphygt-v UniKS-UTF16-V !HYGoThic-Medium |
---|
| 238 | +EOF |
---|
| 239 | + cp $TLSRCDIR/uptex/convbkmk.rb $SRCDIR/inst/bin/$ARCH/ |
---|
| 240 | +fi |
---|
| 241 | |
---|
| 242 | Diff finished. Wed Nov 23 19:10:58 2011 |
---|
| 243 | diff -up texlive-2011/tl11/scripts/build-post.sh.vine texlive-2011/tl11/scripts/build-post.sh |
---|
| 244 | --- texlive-2011/tl11/scripts/build-post.sh.vine 2011-11-23 19:10:27.848058399 +0900 |
---|
| 245 | +++ texlive-2011/tl11/scripts/build-post.sh 2011-11-23 19:13:50.011070042 +0900 |
---|
| 246 | @@ -1,14 +1,15 @@ |
---|
| 247 | -#!/bin/bash |
---|
| 248 | +#!/bin/bash -x |
---|
| 249 | |
---|
| 250 | . ./common.sh $* |
---|
| 251 | |
---|
| 252 | cd $SRCDIR/inst |
---|
| 253 | -cp -r texmf texmf.orig |
---|
| 254 | -cp -r $TLINSTDIR/texmf . |
---|
| 255 | -cp -r ../texk/tetex/updmap.pl texmf/scripts/tetex/ |
---|
| 256 | -cp texmf.orig/web2c/fmtutil.cnf texmf/web2c/fmtutil.cnf |
---|
| 257 | -cp texmf.orig/web2c/texmf.cnf texmf/web2c/texmf.cnf |
---|
| 258 | -rm -rf texmf.orig |
---|
| 259 | +[ -d texmf ] && tar cpf texmf-orig.tar texmf && mv texmf texmf.orig || exit 1 |
---|
| 260 | +[ -d $TLINSTDIR/texmf ] && cp -far $TLINSTDIR/texmf . || exit 1 |
---|
| 261 | +## cp -r ../texk/tetex/updmap.pl texmf/scripts/tetex/ |
---|
| 262 | +## cp texmf.orig/web2c/fmtutil.cnf texmf/web2c/fmtutil.cnf |
---|
| 263 | +## cp texmf.orig/web2c/texmf.cnf texmf/web2c/texmf.cnf |
---|
| 264 | +[ -d texmf -a -d texmf.orig -a -f texmf-orig.tar ] && tar xpf texmf-orig.tar && rm -f texmf-orig.tar || exit 1 |
---|
| 265 | +## rm -rf texmf.orig |
---|
| 266 | |
---|
| 267 | # if [ "$FLG_UP" = "TRUE" ] ;then |
---|
| 268 | # cd texmf |
---|
| 269 | @@ -34,7 +35,8 @@ KanjiMap morisawa.map |
---|
| 270 | EOF |
---|
| 271 | |
---|
| 272 | |
---|
| 273 | -ln -s $TLINSTDIR/tlpkg tlpkg |
---|
| 274 | +## ln -s $TLINSTDIR/tlpkg tlpkg |
---|
| 275 | +cp -ra $TLINSTDIR/tlpkg tlpkg || exit 1 |
---|
| 276 | |
---|
| 277 | exit 0 |
---|
| 278 | |
---|
| 279 | @@ -61,5 +63,5 @@ uphysmjm-v UniKS-UTF16-V |
---|
| 280 | uphygt-h UniKS-UTF16-H !HYGoThic-Medium |
---|
| 281 | uphygt-v UniKS-UTF16-V !HYGoThic-Medium |
---|
| 282 | EOF |
---|
| 283 | - cp $TLSRCDIR/uptex/convbkmk.rb $SRCDIR/inst/bin/$ARCH/ |
---|
| 284 | + cp $TLSRCDIR/uptex/convbkmk.rb $SRCDIR/inst/bin/ |
---|
| 285 | fi |
---|
| 286 | |
---|
| 287 | Diff finished. Wed Nov 23 19:13:53 2011 |
---|
| 288 | diff -up texlive-2011/tl11/scripts/install.sh.vine texlive-2011/tl11/scripts/install.sh |
---|
| 289 | --- texlive-2011/tl11/scripts/install.sh.vine 2011-11-08 15:56:41.000000000 +0900 |
---|
| 290 | +++ texlive-2011/tl11/scripts/install.sh 2011-11-13 16:14:42.809982841 +0900 |
---|
| 291 | @@ -30,8 +30,8 @@ cat <<EOF |
---|
| 292 | Installation is finished. |
---|
| 293 | Please set \$PATH: |
---|
| 294 | |
---|
| 295 | - (sh/bash user): export PATH=$PREFIX/bin/$ARCH:\$PATH |
---|
| 296 | - (csh/tcsh user): setenv PATH $PREFIX/bin/$ARCH:\$PATH |
---|
| 297 | + (sh/bash user): export PATH=$PREFIX/bin:\$PATH |
---|
| 298 | + (csh/tcsh user): setenv PATH $PREFIX/bin:\$PATH |
---|
| 299 | EOF |
---|
| 300 | |
---|
| 301 | exit 0 |
---|
| 302 | |
---|
| 303 | Diff finished. Sun Nov 13 16:14:45 2011 |
---|