X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=885c1c3af3e42f3acf981b191adeebc1e75ab960;hp=7e2824128fa3bd35a66f2108e91bf177b99c217b;hb=943522818291869953657ce12e96f229dba03601;hpb=a081cbf2cf3223da081d960b68c12887d130b8ec

diff --git a/Makefile b/Makefile
index 7e28241..885c1c3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ tasks = upstream/tasks
 flags = -march=mips1
 MIPS_CC = mips-unknown-elf-gcc
 MIPS_CXX = mips-unknown-elf-g++
+MIPS_G77 = mips-unknown-elf-g77
 
 # Be VERY careful about changing any of these as they can break binary 
 # compatibility and create hard to find bugs
@@ -173,13 +174,14 @@ 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/build/build_tex
-	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > .manifest
+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 \
+		TeX.class \
 		$(runtime_classes:%=org/ibex/nestedvm/%.class) \
-		org/ibex/nestedvm/Runtime\$$*.class \
-		org/ibex/nestedvm/util/Seekable\$$*.class
+		org/ibex/nestedvm/*.class \
+		org/ibex/nestedvm/util/*.class
 
 runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
 	cd build && jar cf ../$@ \
@@ -219,7 +221,7 @@ rebuild-constants: $(tasks)/build_newlib
 		echo "public interface UsermodeConstants {"; \
 		tr '\t' ' ' | sed -n ' \
 			s/  */ /g; \
-			s/ *# *define \([A-Z_][A-Za-z0-9_]*\) \([0-9][0-9x]*\)/    public static final int \1 = \2;/p'; \
+			s/ *# *define \([A-Z_][A-Za-z0-9_]*\) \([0-9][0-9a-fA-Fx]*\)/    public static final int \1 = \2;/p'; \
 		echo "}"; \
 	) > src/org/ibex/nestedvm/UsermodeConstants.java
 
@@ -232,6 +234,7 @@ rebuild-constants: $(tasks)/build_newlib
 build/tests/Env.class: build/org/ibex/nestedvm/Runtime.class build/org/ibex/nestedvm/Interpreter.class
 
 # Generic Hello Worldish test
+test_COMPILERFLAGS = -o unixruntime
 test: build/tests/Test.class
 	$(JAVA) -cp build tests.Test "arg 1" "arg 2" "arg 3"
 inttest: build/tests/Test.mips build/org/ibex/nestedvm/Interpreter.class
@@ -260,7 +263,7 @@ Paranoia_CFLAGS = "-Wno-error"
 Paranoia_LDFLAGS = -lm
 paranoiatest: build/tests/Paranoia.class
 	$(JAVA) -cp build tests.Paranoia
-
+	
 #
 # Freetype Stuff
 #
@@ -311,7 +314,7 @@ build/tests/BusyBox.mips: $(mips_objects) $(tasks)/build_busybox
 	cp upstream/build/busybox/busybox $@
 
 busyboxtest: build/tests/BusyBox.class
-	$(JAVA) -cp $(classpath) tests.BusyBox ash
+	$(JAVA) -Dnestedvm.busyboxhack=true -cp $(classpath) tests.BusyBox ash
 
 #
 # Boehm GC
@@ -389,8 +392,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