changes made after tupshins reconstruction

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index fc29a6a..9f13b38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,11 +80,13 @@ 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
 
-build/java/org/xwt/mips/util/%: .install_mips2java
+build/java/org/xwt/mips/util/%:
+       @test -e .install_mips2java || make .install_mips2java
        @echo linking $@
        @mkdir -p $(@D)
        @cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
-build/java/org/xwt/mips/%: .install_mips2java
+build/java/org/xwt/mips/%:
+       @test -e .install_mips2java || make .install_mips2java
        @echo linking $@
        @mkdir -p $(@D)
        @test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \
@@ -100,7 +102,7 @@ build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
        @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
        (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n';                           \
         java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
-        | sed 's,//.*$$,,;'| tr -d '\n') > build/java/org/xwt/translators/MIPSApps.java
+        | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/xwt/translators/MIPSApps.java
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        ./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
 
@@ -127,13 +129,13 @@ compile: .compile
        @./.jikes $(java_sources)
        touch .compile
 
-build/JVM/xwt.jar: .compile build/res/builtin.jar
+build/JVM/xwt.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
        mkdir -p build/JVM
        echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
        cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
        cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
-               `find . \! -type d \! -path './org/xwt/mips/*'` \
+               `find . \! -type d` \
                $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 
 
@@ -238,50 +240,14 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 
 ### Maintainer ######################################################################################
 
-propose-patch:
-       @echo -n "Please type a one-line description of this bug: "; \
-       read A; \
-       echo; \
-       echo "Please type any additional comments that explain this patch."; \
-        echo "If this patch fixes a bug, include a link to bugs.xwt.org."; \
-        echo "When you are done, press control-d on a new line."; \
-       echo; \
-       (       echo -e "HELO patcher"; \
-               echo -e "MAIL FROM:$(USER)@xwt.org"; \
-               echo -e "RCPT TO: patches@xwt.org"; \
-               echo -e "DATA"; \
-               echo -e "From: $(USER)@xwt.org"; \
-               echo -e "To: patches@xwt.org"; \
-               echo -e "Subject: proposed patch to $(this_branch): $$A"; \
-               echo -e ""; \
-               cat; \
-               echo; \
-               cvs diff -Bud; \
-               echo .; \
-       ) > .message
-       bash -c "cat .message > /dev/tcp/mail.xwt.org/25"     # /dev/tcp is faked by bash; not part of the os
-
 current_build         := $(shell cat next.build)
-this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
-this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
-
 strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)
 install-dist:;     $(strip_$(platform)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
 dist: compile
-ifneq ($(shell uname -n),megacz.com)
-       echo "***********************************************************"
-       echo "*  This build is $(current_build)                                     *"
-       echo "***********************************************************"
-       cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
-       echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs -d /cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
-                ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
-else
        (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
        mv next.build- next.build
        echo -n "Next build will be "; cat next.build
-       cvs update CHANGES; echo -e \n`date +%d-%b`" =========== build $(current_build) ================" >> CHANGES
-       cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
        nice -n 19 make all
        make install-dist platform=Win32
        make install-dist platform=Linux
@@ -289,4 +255,4 @@ else
        make install-dist platform=Darwin
        make install-dist platform=JVM
        echo -e "\n\n\n*** DONE ******************************************"
-endif
+