projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7206950
)
build process bugfixes
author
adam
<adam@megacz.com>
Wed, 14 Apr 2004 10:03:08 +0000
(10:03 +0000)
committer
adam
<adam@megacz.com>
Wed, 14 Apr 2004 10:03:08 +0000
(10:03 +0000)
darcs-hash:
20040414100308
-5007d-
e244053868ea632387e09f6ce70516e89855d65a
.gz
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
5742634
..
7f1d74a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-185,12
+185,16
@@
$(call link_upstream,%.cc,src)
### Java Class Files ##############################################################################
compile: .compile
### Java Class Files ##############################################################################
compile: .compile
-.compile: .download_org.ibex.nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
-
-build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java .download_gnu.regexp-1.1.4
- @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+.compile: .download_org.ibex.nestedvm .download_bcel-5.1 .download_gnu.regexp-1.1.4 $(java_sources)
+ @echo -e "\n\033[1mcompiling .java -> .class\033[0m"
+ @mkdir -p build/java build/class
@mkdir -p build/class/org/ibex/util build/class/gnu/regexp build/java build/class
@mkdir -p build/class/org/ibex/util build/class/gnu/regexp build/java build/class
- $(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
+ @test -e build/class/org/ibex/util/Preprocessor.class || \
+ $(javac) src/org/ibex/util/Preprocessor.java \
+ src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
+ @echo $(java_sources) | tr ' ' '\n' | sed 's_build/java/_ _' | sed 's_/_._g' | sed 's_.java$$__g'
+ @$(javac) $(java_sources) -d build/class
+
build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm
@mkdir -p build/java/org/ibex/util
build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm
@mkdir -p build/java/org/ibex/util
@@
-198,11
+202,6
@@
build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.
java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
-$(java_classes): build/class/org/ibex/util/Preprocessor.class $(java_sources)
- @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
- @mkdir -p build/java build/class
- $(javac) $(java_sources) -d build/class
-
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
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
@@
-407,7
+406,7
@@
dist: compile
echo -e "\n\n\n*** DONE ******************************************"
propose-patch:
echo -e "\n\n\n*** DONE ******************************************"
propose-patch:
- @darcs send --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+ @darcs push --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";\
@(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";\