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:
b3193eb
)
use darcs to fetch upstream repos
author
adam
<adam@megacz.com>
Wed, 14 Apr 2004 09:55:20 +0000
(09:55 +0000)
committer
adam
<adam@megacz.com>
Wed, 14 Apr 2004 09:55:20 +0000
(09:55 +0000)
darcs-hash:
20040414095520
-5007d-
b689794d0a7bb2120a4839a061636e2c156f5bd2
.gz
Makefile
patch
|
blob
|
history
Makefile.upstream
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
3fe690f
..
5742634
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-167,10
+167,10
@@
build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Prepro
@echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m"
@mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@
@echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m"
@mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@
-upstream/org.ibex.crypto/%.java:; @make -s .download_org.ibex.crypto &>/dev/null
-upstream/org.ibex.nestedvm/%.java:; @make -s .download_org.ibex.nestedvm &>/dev/null
+upstream/org.ibex.crypto/%.java:; @make .download_org.ibex.crypto
+upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm
link_upstream = build/java/$(1): $(2)/$(1);
link_upstream = build/java/$(1): $(2)/$(1);
-link_upstream += @echo -e "\033[1mlinking .java -> .java: $$< -> $$@\033[0m";
+link_upstream += @echo -e "\033[1mlinking .java -> .java: $$@\033[0m";
link_upstream += mkdir -p $$(@D);
link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
$(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
link_upstream += mkdir -p $$(@D);
link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
$(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
diff --git
a/Makefile.upstream
b/Makefile.upstream
index
1bfa9d6
..
dd447a8
100644
(file)
--- a/
Makefile.upstream
+++ b/
Makefile.upstream
@@
-107,11
+107,11
@@
environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bi
.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
-.download_org.ibex.nestedvm:
- mkdir -p upstream/org.ibex.nestedvm
- cd upstream/org.ibex.nestedvm; wget -l 999 -nH -r http://nestedvm.ibex.org/
- find upstream/org.ibex.nestedvm -name index.html -exec rm -f {} \;
- touch $@
+.download_org.ibex.%:
+ @echo -e "\033[1mfetching repository org.ibex.$*\033[0m"
+ @mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_*
+ @cd upstream; darcs get --verbose --partial --repo-name=org.ibex.$* http://$*.ibex.org
+ @touch $@
.build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm
cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
.build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm
cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
@@
-120,12
+120,6
@@
environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bi
.install_org.ibex.nestedvm: .build_org.ibex.nestedvm
touch $@
.install_org.ibex.nestedvm: .build_org.ibex.nestedvm
touch $@
-.download_org.ibex.crypto:
- mkdir -p upstream/org.ibex.crypto
- cd upstream/org.ibex.crypto; wget -l 999 -nH -r http://crypto.ibex.org/
- find upstream/org.ibex.crypto -name index.html -exec rm -f {} \;
- touch $@
-
# vendor-supplied binaries and headers; this is stuff that comes with various OSes
vendor: .vendor; @true
.vendor:
# vendor-supplied binaries and headers; this is stuff that comes with various OSes
vendor: .vendor; @true
.vendor: