From: adam Date: Fri, 14 May 2004 08:13:24 +0000 (-0700) Subject: build TeX, use it to compile paper X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=commitdiff_plain;h=1559c0f40ba4ce4d6eb544cd1593beb60a0f49b2 build TeX, use it to compile paper darcs-hash:20040514081324-5007d-4918c0201775abb4a694161822997616c4e34519.gz --- diff --git a/Makefile b/Makefile index 2cabf44..c744751 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,7 @@ env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class runtime_classes = Runtime Registers UsermodeConstants util/Seekable -tex.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class) upstream/tasks/build_tex +tex.jar: $(mips_objects) $(runtime_classes:%=build/org/ibex/nestedvm/%.class) upstream/tasks/build_tex echo -e "Manifest-Version: 1.0\nMain-Class: TeX\n" > .manifest cp upstream/build/tex/TeX.class build cd build && jar cfm ../$@ ../.manifest \ @@ -390,8 +390,15 @@ doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot cd doc/charts; chmod +x boxfill.pl; ./boxfill.pl -g -o unfilled.eps $*.eps cd doc/charts; ps2pdf $*.eps -doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) - cd doc; pdflatex ivme04.tex && ./pst2pdf && pdflatex ivme04.tex +tex := java -cp $(usr)/../../build:.. TeX + +#tex := java -cp $(usr)/../../build:.. org.ibex.nestedvm.Interpreter ../tex.mips +doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) tex.jar upstream/tasks/extract_texinputs + cp upstream/build/tex/tex.pool upstream/build/tex/texinputs/tex.pool + cd upstream/build/tex/texinputs; echo '\latex.ltx' | $(tex) + cd upstream/build/tex/texinputs; ln -fs ../../../../doc/* .; rm -f ivme04.aux; touch ivme04.aux; touch ivme04.bbl + cd upstream/build/tex/texinputs; echo '\&latex \input ivme04.tex' | $(tex) + cd upstream/build/tex/texinputs; dvipdf ivme04.dvi pdf: doc/ivme04.pdf open doc/ivme04.pdf diff --git a/upstream/Makefile b/upstream/Makefile index e91b0c2..1d61401 100644 --- a/upstream/Makefile +++ b/upstream/Makefile @@ -2,10 +2,12 @@ version_gcc = 3.3 version_gpc = 20030830 +version_texinputs = 1.0 url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz url_gcc-c++ = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz url_gcc-gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz url_gcc-g77 = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz +url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch configure_gcc = --target=mips-unknown-elf --disable-threads --with-gnu-ld --with-gnu-as --with-newlib=yes --enable-sjlj-exceptions --enable-languages="c" configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,pascal,f77" @@ -51,14 +53,6 @@ clean_%: rm -rf "build/$(*)"* rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*" -tasks/download_tex: ; touch $@ -tasks/extract_tex: - mkdir -p build/tex - cd build/tex; wget -N http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web -# cd build/tex; wget -N http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.ch - cd build/tex; wget -N http://www.tug.org/tex-archive/systems/knuth/local/tex/initex.ch && mv initex.ch tex.ch - cd build/tex; wget -N http://www.gnu-pascal.de/crystal/gpc/en/attachments/5593/tangle.p.gz && gunzip tangle.p.gz - touch $@ gpc := $(usr)/bin/mips-unknown-elf-gpc gpc_flags := --big-endian -w -lgpc -lc $(usr)/mips-unknown-elf/lib/support*.o @@ -68,24 +62,32 @@ g77_flags := --big-endian -w -lg2c -lc $(usr)/mips-unknown-elf/lib/support*.o g77_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld # FIXME ugly path hacks evil bad -nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../nestedvm.jar org.ibex.nestedvm.Compiler -outformat class +nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../build org.ibex.nestedvm.Compiler -outformat class + +tasks/download_tex: ; mkdir -p build/tex; touch $@ +build/tex/tex.web: ; curl -o $@ http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web +build/dtex/tangle.p: ; curl http://www.gnu-pascal.de/crystal/gpc/en/attachments/5593/tangle.p.gz | zcat > $@ +tasks/extract_tex: build/tex/tex.web build/tex/tangle.p; touch $@ -tasks/build_tex: tasks/full_toolchain tasks/extract_tex +build/tex/tangle.mips: build/tex/tangle.p tasks/full_toolchain tasks/extract_tex tasks/build_gcc_step2 cd build/tex; $(gpc) tangle.p $(gpc_flags) -o tangle.mips - cd build/tex; $(nestedvm) -o unixruntime -outfile Tangle.class Tangle tangle.mips - cd build/tex; java -cp .:$(usr)/../../nestedvm.jar Tangle \ - --gpc-rts=-nPascalfile:tex.unpatched.p \ +build/tex/Tangle.class: build/tex/tangle.mips + $(nestedvm) -o unixruntime -outfile $@ Tangle $< +build/tex/tex.p: build/tex/tex.web build/tex/tex.ch build/tex/Tangle.class + rm -f build/tex/tex.p build/tex/tex.pool + cd build/tex; java -cp .:$(usr)/../../build Tangle \ + --gpc-rts=-nPascalfile:tex.p \ --gpc-rts=-npool:tex.pool \ --gpc-rts=-nwebfile:tex.web \ --gpc-rts=-nchangefile:tex.ch - cd build/tex; cat tex.unpatched.p | sed s_STANDARDTEXT_TEXT_ | sed 's_\\^DIV_\\^ DIV_g' > tex.p - cd build/tex; PATH=$$PATH:../../install/bin; $(gpc) tex.p $(gpc_flags) -o tex.mips +build/tex/tex.mips: build/tex/tex.p tasks/full_toolchain tasks/build_gcc_step2 + cd build/tex; $(gpc) tex.p $(gpc_flags) -o tex.mips +tasks/build_tex: build/tex/tex.mips cd build/tex; $(nestedvm) -o unixruntime -outfile TeX.class TeX tex.mips - #ln -s tex.pool 'TeXformats:TEX.POOL ' - #ln -s trip.tfm 'TeXfonts:trip.tfm ' - #ln -s trip.tex 'trip.tex ' + touch $@ +tasks/extract_texinputs: tasks/build_tex tasks/download_texinputs + cd build/tex; tar xvzf ../../download/texinputs-1.0.tgz touch $@ - tasks/extract_linpack: tasks/download_linpack ; touch $@ tasks/download_linpack: mkdir -p build/linpack