X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=72f68df2759b8a022cdf0cffe3c814550bbf96a3;hp=a67c9e52d00081bc23e247555aece6dd40b62220;hb=eb69dc64717856f2e0f1471f4fcab998329627a2;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b

diff --git a/Makefile b/Makefile
index a67c9e5..72f68df 100644
--- a/Makefile
+++ b/Makefile
@@ -104,11 +104,8 @@ java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
 java_sources              += build/java/org/xwt/mips/util/SeekableData.java
 java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
 java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
-java_sources              += build/java/org/xwt/mips/ClassFileCompiler.java
-java_sources              += build/java/org/xwt/mips/ELF.java
 java_sources              += build/java/org/xwt/mips/Registers.java
 java_sources              += build/java/org/xwt/mips/Runtime.java
-java_sources              += build/java/org/xwt/mips/UnixRuntime.java
 java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
 
 java_classes              := $(java_sources:build/java/%.java=build/class/%.class)
@@ -152,7 +149,7 @@ build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_nest
 	mkdir -p build/java/org/ibex/util
 	@echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
 	java -cp upstream/nestedvm/build:upstream/nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
-		org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< -outfile $@
+		org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
 #-o onepage,pagesize=8m
 
 compile: .compile
@@ -173,7 +170,7 @@ endif
 build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/Java2/ibex.jar\033[0m"
 	mkdir -p build/Java2
-	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/Java2/.manifest
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest
 	cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
 	cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest `find . -name \*.class -or -name \*.jar`
 
@@ -328,8 +325,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/o
 	upstream/install/bin/mips-unknown-elf-gcc \
 		--static \
 		-march=mips1 \
-		-T upstream/mips/org/xwt/mips/linker.ld \
-		-L upstream/mips/build/org/xwt/mips/ \
+		-T upstream/nestedvm/src/org/xwt/mips/linker.ld \
+		-L upstream/nestedvm/build/org/xwt/mips/ \
 		-L upstream/freetype-2.1.4/src/objs \
 		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
@@ -358,7 +355,7 @@ dist: compile
 	echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-	@darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+	@darcs send --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
 	@(echo "To: patches@xwt.org";\
 	 SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
 	 echo "Subject: $$SUB";\