summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Traut <manut@mecka.net>2012-05-30 14:52:00 +0200
committerManuel Traut <manut@mecka.net>2012-05-30 14:52:00 +0200
commitcc67c2e498ccc7b504799fa18bfe0c608d425dba (patch)
treeabbe890c60cee21bf33d7dc89ad8cf8063c5e857
parent42bdbc9738e5768bb2fe690cc5c25119ef8264e5 (diff)
COMPILE: fixed and described deps/acetao build
- use build-acetao.sh on native linux platforms Signed-off-by: Manuel Traut <manut@mecka.net>
-rw-r--r--COMPILE16
-rwxr-xr-xdeps/build-acetao.sh10
-rw-r--r--manager/COMPILE14
3 files changed, 24 insertions, 16 deletions
diff --git a/COMPILE b/COMPILE
new file mode 100644
index 0000000..1623942
--- /dev/null
+++ b/COMPILE
@@ -0,0 +1,16 @@
+COMPILE DISTRIBUTED-IO
+======================
+Manuel Traut <manut@mecka.net>
+
+MPC/ACE/TAO
+-----------
+The TAO CORBA framework is used by the distributed-io Manager.
+It depends on the MakeProjectCreator (MPC) and on ACE.
+
+You should use the ACE/TAO packages provided by your distribution. If your
+distribution doesn't have packaged ACE/TAO you can build it by this steps:
+
+ 1) git submodule init
+ 2) git submodule update
+ 3) cd deps
+ 4) ./build-acetao.sh
diff --git a/deps/build-acetao.sh b/deps/build-acetao.sh
index 54d3e8e..6ddd4a7 100755
--- a/deps/build-acetao.sh
+++ b/deps/build-acetao.sh
@@ -9,6 +9,7 @@ LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
export ACE_ROOT=$ACE_ROOT
export TAO_ROOT=$TAO_ROOT
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
echo '#include "ace/config-linux.h"' > ace/config.h
echo include $ACE_ROOT/include/makeinclude/platform_linux.GNU > \
@@ -24,10 +25,15 @@ unlink TAO
ln -s ../TAO TAO
TAO_ROOT=`pwd`/TAO
-echo ACE: $ACE_ROOT TAO: $TAO_ROOT
+echo ACE: $ACE_ROOT
+echo TAO: $TAO_ROOT
-$ACE_ROOT/bin/mwc.pl -type gnuace TAO/TAO_ACE.mwc
+cd TAO
+$ACE_ROOT/bin/mwc.pl -type gnuace TAO_ACE.mwc
+cd -
make -j9
+sudo ACE_ROOT=$ACE_ROOT TAO_ROOT=$TAO_ROOT make install
cd TAO
$ACE_ROOT/bin/mwc.pl -type gnuace TAO/TAO.mwc
make -j9
+sudo ACE_ROOT=$ACE_ROOT TAO_ROOT=$TAO_ROOT make install
diff --git a/manager/COMPILE b/manager/COMPILE
deleted file mode 100644
index a453b3a..0000000
--- a/manager/COMPILE
+++ /dev/null
@@ -1,14 +0,0 @@
-COMPILE DISTRIBUTED-IO
-======================
-Manuel Traut <manut@mecka.net>
-
-MPC/ACE/TAO
------------
-The TAO CORBA framework is used by the distributed-io server. It depends on the
-MakeProjectCreator (MPC) and on ACE. To build these components from source
-do the following steps:
-
- 1) git submodule init
- 2) git submodule update
- 3) cd deps/ace
- 4)