X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=530aa036dcf0f710a69c5cb10e040756ea989a4a;hp=bac1e265aa990a69e3933e06ad41884428932cdb;hb=18f9d34628d03afdf74b95ccd96e6e2e8441fb54;hpb=b7956688249a89b71e4873cdff862631e4b3704a

diff --git a/Makefile b/Makefile
index bac1e26..530aa03 100644
--- a/Makefile
+++ b/Makefile
@@ -218,6 +218,7 @@ runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
 
 nestedvm.jar: $(java_classes) .manifest
 	cd build && jar cfm ../$@ ../.manifest $(java_classes:build/%.class=%*.class)
+	cd $(CLASSGEN_PATH) && jar uf $(mips2java_root)/$@ .
 
 compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass
 	mkdir -p tmp/pruned
@@ -229,7 +230,8 @@ compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcc
 		org.ibex.nestedvm.RuntimeCompiler.main 'org.ibex.nestedvm.Runtime.decodeData' \
 		'org.ibex.nestedvm.UnixRuntime.<init>' 'org.ibex.nestedvm.Runtime.initPages' \
 		'org.ibex.nestedvm.Runtime.clearPages' 'org.ibex.nestedvm.Runtime.syscall' \
-		'org.ibex.nestedvm.Runtime$$CPUState.dup'
+		'org.ibex.nestedvm.Runtime$$CPUState.dup' \
+		org.ibex.nestedvm.util.Platform\$$Jdk{11,12,13,14}.'<init>'
 	cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
 
 sizecheck: compact_runtime_compiler.jar
@@ -245,7 +247,7 @@ rebuild-constants: $(tasks)/build_libc
 	( \
 		cat \
 			src/org/ibex/nestedvm/syscalls.h \
-			$(usr)/mips-uknown-elf/include/nestedvm/sockets.h \
+			$(usr)/mips-unknown-elf/include/nestedvm/socket.h \
 			$(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h,sysctl.h}; \
 		$(MIPS_CC) -E -dM $(usr)/mips-unknown-elf/include/sys/fcntl.h | awk '$$2 ~ /^[OF]_/ { print; }'; \
 	) | ( \
@@ -471,11 +473,13 @@ doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot
 
 doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) build/tests/TeX.class
 	cp upstream/build/tex/tex.pool upstream/build/tex/texinputs/tex.pool
-	cd upstream/build/tex/texinputs && echo '\latex.ltx' | java -cp $(build) tests.TeX
+	cd upstream/build/tex/texinputs && echo '\latex.ltx' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.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' | java -cp $(build) tests.TeX
+	cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX
+	cd upstream/build/tex/texinputs && bibtex ivme04
+	cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX
 	cd upstream/build/tex/texinputs && dvipdf ivme04.dvi
-	cp upstream/build/tex/texinputs/ivme04.pdf $@
+	#cp upstream/build/tex/texinputs/ivme04.pdf $@
 
 pdf: doc/ivme04.pdf
 	open doc/ivme04.pdf