]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
Systemless trees are imported to this one as git submodules; added support for lpceur...
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 8 Apr 2008 14:19:00 +0000 (16:19 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 8 Apr 2008 14:33:13 +0000 (16:33 +0200)
You should run build/prepare_infrastructure to update building tree.

38 files changed:
.gitmodules [new file with mode: 0644]
build/_infrastructure/sysless-h8300 [new submodule]
build/_infrastructure/sysless-lpc21xx [new submodule]
build/h8canusb/Makefile
build/h8canusb/Makefile.omk
build/h8canusb/Makefile.rules
build/h8canusb/README.makerules
build/h8canusb/app
build/h8canusb/arch
build/h8canusb/board
build/h8canusb/libs4c
build/h8eurobot/Makefile
build/h8eurobot/Makefile.omk
build/h8eurobot/Makefile.rules
build/h8eurobot/README.makerules
build/h8eurobot/app
build/h8eurobot/arch
build/h8eurobot/board
build/h8eurobot/libs4c
build/h8mirosot/Makefile
build/h8mirosot/Makefile.omk
build/h8mirosot/Makefile.rules
build/h8mirosot/README.makerules
build/h8mirosot/app
build/h8mirosot/arch
build/h8mirosot/board
build/h8mirosot/libs4c
build/lpceurobot/Makefile [new symlink]
build/lpceurobot/Makefile.omk [new symlink]
build/lpceurobot/Makefile.rules [new symlink]
build/lpceurobot/app [new symlink]
build/lpceurobot/arch [new symlink]
build/lpceurobot/board [new symlink]
build/lpceurobot/common [new symlink]
build/lpceurobot/config.target [new symlink]
build/lpceurobot/doc [new symlink]
build/lpceurobot/libs4c [new symlink]
build/prepare_infrastructure

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..df7a5b2
--- /dev/null
@@ -0,0 +1,6 @@
+[submodule "build/_infrastructure/sysless-lpc21xx"]
+       path = build/_infrastructure/sysless-lpc21xx
+       url = git://rtime.felk.cvut.cz/sysless-lpc21xx.git
+[submodule "build/_infrastructure/sysless-h8300"]
+       path = build/_infrastructure/sysless-h8300
+       url = git://rtime.felk.cvut.cz/sysless-h8300
diff --git a/build/_infrastructure/sysless-h8300 b/build/_infrastructure/sysless-h8300
new file mode 160000 (submodule)
index 0000000..0b85cca
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 0b85ccaa0a48bceb2796cb65b7407a79e4c67600
diff --git a/build/_infrastructure/sysless-lpc21xx b/build/_infrastructure/sysless-lpc21xx
new file mode 160000 (submodule)
index 0000000..dbec77c
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit dbec77ccc1184760f6948c3bf2c4b60c5e71417e
index 34ef4a22d0eb8a136655dc87d39e973a91ffa663..af24e009ecd9263736a123dc2e626479f9a7907c 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile
\ No newline at end of file
index 9606c8d6ccdee7fd316f4e60d5429a3225fcce7c..631eade23cabcab0515e758fe85823dfb98434a5 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile.omk
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile.omk
\ No newline at end of file
index bec717d0f8afc3b9b73357a81e97898673e25715..36098e5ad280d636a14b389e0f38b368f8c89450 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile.rules
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile.rules
\ No newline at end of file
index 69fb737f1ce610235da6fedd0c94bd4a5b028bab..9f2370677bd2295562a0fa52103bd9960d8ba8fc 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/README.makerules
\ No newline at end of file
+../_infrastructure/sysless-h8300/README.makerules
\ No newline at end of file
index dd10d89b42841b085e174ad624c9e12bd28d0cf3..de27fc40f5cb3b62f209f01db21ae88299e4ff42 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/app
\ No newline at end of file
+../_infrastructure/sysless-h8300/app
\ No newline at end of file
index 17b6e20888f5a43ed298a4b7df034be011b7886a..9f5ac713366c7c41118f5de26330620b89d41c34 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/arch
\ No newline at end of file
+../_infrastructure/sysless-h8300/arch
\ No newline at end of file
index 3ed46c3d69648f086bca6d4994e8af07eee54fde..4ef8e875f3bcd6947f8885f547c1a22f53f410cc 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/board
\ No newline at end of file
+../_infrastructure/sysless-h8300/board
\ No newline at end of file
index 2cef71fa5f7bbc71c2610ef1011580d7460c61ee..7e5718a28e8c79f7280507c9c1249bb186297cdd 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/libs4c
\ No newline at end of file
+../_infrastructure/sysless-h8300/./libs4c
\ No newline at end of file
index 34ef4a22d0eb8a136655dc87d39e973a91ffa663..af24e009ecd9263736a123dc2e626479f9a7907c 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile
\ No newline at end of file
index 9606c8d6ccdee7fd316f4e60d5429a3225fcce7c..631eade23cabcab0515e758fe85823dfb98434a5 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile.omk
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile.omk
\ No newline at end of file
index bec717d0f8afc3b9b73357a81e97898673e25715..36098e5ad280d636a14b389e0f38b368f8c89450 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile.rules
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile.rules
\ No newline at end of file
index 69fb737f1ce610235da6fedd0c94bd4a5b028bab..9f2370677bd2295562a0fa52103bd9960d8ba8fc 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/README.makerules
\ No newline at end of file
+../_infrastructure/sysless-h8300/README.makerules
\ No newline at end of file
index dd10d89b42841b085e174ad624c9e12bd28d0cf3..de27fc40f5cb3b62f209f01db21ae88299e4ff42 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/app
\ No newline at end of file
+../_infrastructure/sysless-h8300/app
\ No newline at end of file
index 17b6e20888f5a43ed298a4b7df034be011b7886a..9f5ac713366c7c41118f5de26330620b89d41c34 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/arch
\ No newline at end of file
+../_infrastructure/sysless-h8300/arch
\ No newline at end of file
index 3ed46c3d69648f086bca6d4994e8af07eee54fde..4ef8e875f3bcd6947f8885f547c1a22f53f410cc 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/board
\ No newline at end of file
+../_infrastructure/sysless-h8300/board
\ No newline at end of file
index 2cef71fa5f7bbc71c2610ef1011580d7460c61ee..954e05f14a75779b88bdf25cb6f02e809150d562 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/libs4c
\ No newline at end of file
+../_infrastructure/sysless-h8300/libs4c
\ No newline at end of file
index 34ef4a22d0eb8a136655dc87d39e973a91ffa663..af24e009ecd9263736a123dc2e626479f9a7907c 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile
\ No newline at end of file
index 9606c8d6ccdee7fd316f4e60d5429a3225fcce7c..631eade23cabcab0515e758fe85823dfb98434a5 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile.omk
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile.omk
\ No newline at end of file
index bec717d0f8afc3b9b73357a81e97898673e25715..36098e5ad280d636a14b389e0f38b368f8c89450 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/Makefile.rules
\ No newline at end of file
+../_infrastructure/sysless-h8300/Makefile.rules
\ No newline at end of file
index 69fb737f1ce610235da6fedd0c94bd4a5b028bab..9f2370677bd2295562a0fa52103bd9960d8ba8fc 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/README.makerules
\ No newline at end of file
+../_infrastructure/sysless-h8300/README.makerules
\ No newline at end of file
index dd10d89b42841b085e174ad624c9e12bd28d0cf3..de27fc40f5cb3b62f209f01db21ae88299e4ff42 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/app
\ No newline at end of file
+../_infrastructure/sysless-h8300/app
\ No newline at end of file
index 17b6e20888f5a43ed298a4b7df034be011b7886a..9f5ac713366c7c41118f5de26330620b89d41c34 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/arch
\ No newline at end of file
+../_infrastructure/sysless-h8300/arch
\ No newline at end of file
index 3ed46c3d69648f086bca6d4994e8af07eee54fde..4ef8e875f3bcd6947f8885f547c1a22f53f410cc 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/board
\ No newline at end of file
+../_infrastructure/sysless-h8300/board
\ No newline at end of file
index 2cef71fa5f7bbc71c2610ef1011580d7460c61ee..954e05f14a75779b88bdf25cb6f02e809150d562 120000 (symlink)
@@ -1 +1 @@
-../_infrastructure/h8300-boot/libs4c
\ No newline at end of file
+../_infrastructure/sysless-h8300/libs4c
\ No newline at end of file
diff --git a/build/lpceurobot/Makefile b/build/lpceurobot/Makefile
new file mode 120000 (symlink)
index 0000000..dd75ade
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/Makefile
\ No newline at end of file
diff --git a/build/lpceurobot/Makefile.omk b/build/lpceurobot/Makefile.omk
new file mode 120000 (symlink)
index 0000000..0fdf28c
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/Makefile.omk
\ No newline at end of file
diff --git a/build/lpceurobot/Makefile.rules b/build/lpceurobot/Makefile.rules
new file mode 120000 (symlink)
index 0000000..97f2e27
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/Makefile.rules
\ No newline at end of file
diff --git a/build/lpceurobot/app b/build/lpceurobot/app
new file mode 120000 (symlink)
index 0000000..e761da1
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/app
\ No newline at end of file
diff --git a/build/lpceurobot/arch b/build/lpceurobot/arch
new file mode 120000 (symlink)
index 0000000..ac27af5
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/arch
\ No newline at end of file
diff --git a/build/lpceurobot/board b/build/lpceurobot/board
new file mode 120000 (symlink)
index 0000000..783165a
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/board
\ No newline at end of file
diff --git a/build/lpceurobot/common b/build/lpceurobot/common
new file mode 120000 (symlink)
index 0000000..cfff434
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/common
\ No newline at end of file
diff --git a/build/lpceurobot/config.target b/build/lpceurobot/config.target
new file mode 120000 (symlink)
index 0000000..09884a5
--- /dev/null
@@ -0,0 +1 @@
+board/lpceurobot/config.lpceurobot
\ No newline at end of file
diff --git a/build/lpceurobot/doc b/build/lpceurobot/doc
new file mode 120000 (symlink)
index 0000000..60df167
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/doc
\ No newline at end of file
diff --git a/build/lpceurobot/libs4c b/build/lpceurobot/libs4c
new file mode 120000 (symlink)
index 0000000..3cd09a6
--- /dev/null
@@ -0,0 +1 @@
+../_infrastructure/sysless-lpc21xx/libs4c
\ No newline at end of file
index 832a0fdc343880dc15c742c9ce33f6c44584fe9e..67d13cc56d0a8325b663f1776acebe6b82db3fa9 100755 (executable)
@@ -15,29 +15,37 @@ function darcs_import()
 }
 
 cd `dirname $0`
+MYDIR=$PWD
+
+########################################
+# Update submodules
+########################################
+cd `git rev-parse --show-cdup`
+git submodule init
+git submodule update
+
+for dir in `git submodule status|awk '{print $2}'`; do
+    export dir
+    (
+       cd $dir
+       git submodule init
+       git submodule update
+    )
+done
 
-#if [ ! -d _infrastructure/sysless-lpc21xx ]; then
-#    git clone git://rtime.felk.cvut.cz/sysless-lpc21xx _infrastructure/sysless-lpc21xx
-#    (cd _infrastructure/sysless-lpc21xx; git submodule init; git submodule update; common/linkarch)
-#else
-#    (cd _infrastructure/sysless-lpc21xx; git pull; git submodule update)
-#fi
-
-if [ ! -d _infrastructure/h8300-boot ]; then
-    git clone git://rtime.felk.cvut.cz/sysless-h8300 _infrastructure/h8300-boot
-    (cd _infrastructure/h8300-boot; git submodule init; git submodule update; common/linkarch)
-else
-    (cd _infrastructure/h8300-boot; git pull; git submodule update)
-fi
-
+########################################
+# Import PXMC
+########################################
+cd $MYDIR
+set +e
+# This can fail if you do not have sufficient rights
 darcs_import ../src/pxmc rtime.felk.cvut.cz:/var/repos/pxmc
+set -e
 
-for i in h8eurobot/ h8mirosot/ h8canusb/ linux/ ppc/; do
+########################################
+# Default config
+########################################
+for i in h8eurobot/ h8mirosot/ h8canusb/ linux/ ppc/ lpceurobot/; do
        make -C $i default-config
 done
 
-# for i in *; do
-#     [ -d $i -a $i != h8300-boot ] && ln -sf ../../$i h8300-boot/app
-# done
-
-# echo "You can find all your applications in h8300-boot/app"