adapted Make system to eclipse IDE

all Makefiles are now created (and should only be modified) using the
IDE
The IDE can generate a makemakefiles script which enables command-line
Makefile creation
See INSTALL for details

NOTE: This is only tested with Linux so far. So any feedback on OSX /
windows would be helpful


git-svn-id: https://mixim.svn.sourceforge.net/svnroot/mixim/trunk@481 ccb5d51d-3e1d-0410-9886-bf3c9037c363

.cproject

@@ -25,23 +25,16 @@
 <tool id="cdt.managedbuild.tool.gnu.archiver.base.1493209585" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1345723921" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 <option id="gnu.cpp.compiler.option.preprocessor.def.561198940" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def"/>
-<option id="gnu.cpp.compiler.option.include.paths.811482987" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MiXiM/include}&quot;"/>
-</option>
+<option id="gnu.cpp.compiler.option.include.paths.811482987" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"/>
 <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1677225756" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 </tool>
 <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1210609911" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-<option id="gnu.c.compiler.option.include.paths.1556334342" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MiXiM/include}&quot;"/>
-</option>
+<option id="gnu.c.compiler.option.include.paths.1556334342" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"/>
 <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.876788787" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 </tool>
 <tool id="cdt.managedbuild.tool.gnu.c.linker.base.610819722" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
 <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.546610095" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
-<option id="gnu.cpp.link.option.paths.167451922" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MiXiM/out/${ConfigName}/src/base}&quot;"/>
-<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MiXiM/out/${ConfigName}/src/modules}&quot;"/>
-</option>
+<option id="gnu.cpp.link.option.paths.167451922" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"/>
 <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.434556665" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 <additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -54,7 +47,7 @@
 </toolChain>
 </folderInfo>
 <sourceEntries>
-<entry excluding="examples/mfNetwork|examples/baseNetwork|examples/positifNetwork|examples/multiChannel|examples/locNetwork|examples/foxtrot|modules/channel|modules/localization|modules/phy|modules/macOld" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+<entry excluding="lib|include|out|documentation|doc|configurator|bin|examples/mfNetwork|examples/baseNetwork|examples/positifNetwork|examples/multiChannel|examples/locNetwork|examples/foxtrot|modules/channel|modules/localization|modules/phy" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 </sourceEntries>
 </configuration>
 </storageModule>
@@ -389,7 +382,7 @@
 </folderInfo>
 <sourceEntries>
 <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="examples/phyLayer"/>
-<entry excluding="examples/CSMAMac|examples/phyLayer|src/modules/channel|src/modules/localization|src/modules/phy|src/modules/macOld|examples/multiChannel|examples/locNetwork|examples/mfNetwork|examples/foxtrot|examples/positifNetwork|examples/baseNetwork|modules/localization|modules/macOld|modules/phy|modules/channel" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+<entry excluding="lib|include|out|documentation|doc|configurator|bin|examples/CSMAMac|examples/phyLayer|src/modules/channel|src/modules/localization|src/modules/phy|src/modules/macOld|examples/multiChannel|examples/locNetwork|examples/mfNetwork|examples/foxtrot|examples/positifNetwork|examples/baseNetwork|modules/localization|modules/macOld|modules/phy|modules/channel" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 </sourceEntries>
 </configuration>
 </storageModule>

.oppbuildspec

@@ -0,0 +1,20 @@
+<buildspec version="4.0">
+<dir makemake-options="-o radioState -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/radioState" type="makemake"/>
+<dir makemake-options="-o MiXiM -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="examples/analogueModels" type="makemake"/>
+<dir makemake-options="-o MiXiM -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="examples/phyLayer" type="makemake"/>
+<dir makemake-options="-o channelInfo -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/channelInfo" type="makemake"/>
+<dir makemake-options="--deep --nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="configurator" type="custom"/>
+<dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="examples" type="makemake"/>
+<dir makemake-options="--deep --make-so -o miximbase -O out --meta:recurse --meta:export-library --meta:use-exported-libs" path="base" type="makemake"/>
+<dir makemake-options="-o MiXiM -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="examples/CSMAMac" type="makemake"/>
+<dir makemake-options="-o coord -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/coord" type="makemake"/>
+<dir makemake-options="-o basePhyLayer -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/basePhyLayer" type="makemake"/>
+<dir makemake-options="-o mapping -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/mapping" type="makemake"/>
+<dir makemake-options="-o connectionManager -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/connectionManager" type="makemake"/>
+<dir makemake-options="--nolink -O out --meta:recurse --meta:export-library --meta:use-exported-libs" path="." type="makemake"/>
+<dir makemake-options="-o baseMobility -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/baseMobility" type="makemake"/>
+<dir makemake-options="-o blackboard -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/blackboard" type="makemake"/>
+<dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests" type="makemake"/>
+<dir makemake-options="--deep --make-so -o miximmodules -O out -lmiximbase --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="modules" type="makemake"/>
+<dir makemake-options="--make-so -o miximtestUtils -O out --meta:auto-include-path --meta:export-library --meta:use-exported-libs" path="tests/testUtils" type="makemake"/>
+</buildspec>

INSTALL

@@ -4,7 +4,7 @@ to compile and start using MiXiM.
 
 Requirements
 ============
-- OMNeT++, at least version 3.2, 
+- OMNeT++, at least version 4.0b8, 
   downloadable at www.omnetpp.org
   OMNeT++ must be compiled with dynamic NED loading enabled 
   (WITH_NETBUILDER=yes setting)
@@ -14,26 +14,39 @@ Requirements
 
 Installation under Linux
 ========================
-1. Unpack the archive (you have probably already done so)
-   tar xzf mixim<VERSION>.tgz
-
-2. Update your LD_LIBRARY_PATH variable to include the
-   "mixim<VERSION>/lib" directory
+Unpack the archive (you have probably already done so)
+ tar xzf mixim<VERSION>.tgz
 
-3. Update your PATH variable to include the
-   "mixim<VERSION>/bin" directory
+Commandline
+-----------
 
-4. run the mkmk shell script
-   ./mkmk
+1. run the following command in the MiXiM root dir
+    make -f makemakefiles CONFIGNAME=gcc-debug
+   (you can alternatively also use the gcc-release configuration)
 
-5. type "make all" to make the mixim library and binary 
+2. type "make all" to make the mixim library and binary 
    and to build the test networks
 
 TODO: we need to be more precise how to get started!!!
 
 Finally try the example networks in the example folder or
 build your own network using the configurator
 
+OMNeT++ IDE
+-----------
+
+1. Add MiXiM as a Project to your OMNeT++ IDE
+
+2. Build MiXiM (Ctrl+B)
+
+3. Choose an example from the examples folder, run it and have fun :-)
+
+=================================================
+TODO: the rest of this file needs to be converted
+   So far MiXiM has only been tested under linux
+   There might be problems under windows or OS-X
+=================================================
+
 
 Installation under Windows
 ==========================