last little cleaning of XML and cmake files

diff --git a/contrib/psg/Makefile b/contrib/psg/Makefile
index 43fc9dd..93470ae 100644 (file)
--- a/contrib/psg/Makefile
+++ b/contrib/psg/Makefile
@@ -5,18 +5,13 @@ all: compile doc
 compile:
        mkdir -p classes
        javac -sourcepath src -classpath $(LIB_JARS):../../simgrid.jar -d classes `find -L -name "*.java"`
-
 doc:
        mkdir -p doc
        javadoc -sourcepath src -classpath $(LIB_JARS):../../simgrid.jar -d doc psgsim
-
 test:
        ./test.sh 
-
 clean: 
        rm -rf classes doc outputs
-       
-# Help Target
 help:
        @echo "The following are a valid targets for this Makefile:"
        @echo "................ all (the default if no target is provided)"
@@ -24,4 +19,4 @@ help:
        @echo "................ doc"
        @echo "................ test"
        @echo "................ clean"
-       
+

diff --git a/contrib/psg/platforms/psg.xml b/contrib/psg/platforms/psg.xml
index e2a96ed..ad5e2a2 100644 (file)
--- a/contrib/psg/platforms/psg.xml
+++ b/contrib/psg/platforms/psg.xml
@@ -5,19 +5,16 @@
                 |          |
                 |  router  |
     ____________|__________|_____________ backbone
-      |   |   |              |     |   |       
+      |   |   |              |     |   |
     l0|        l1| l2|           l97| l96 |   | l99
       |   |   |   ........   |     |   |
       |                                |
-    c-0.me                             c-99.me 
+    c-0.me                             c-99.me          -->
+
+<config> <prop id="network/latency_factor" value="1.0"/></config>
 
--->
-<config>
-<prop id="network/latency_factor" value="1.0"/>
-</config>
 <AS  id="AS0"  routing="Full">
-  <cluster id="my_cluster_1" prefix="" suffix=""
-               radical="0-50000"       speed="1Gf"  bw="200Mbps" lat="0ms"
-        bb_bw="200Mbps" bb_lat="0ms"/>
+  <cluster id="my_cluster_1" prefix="" suffix="" radical="0-50000"     speed="1Gf"  bw="200Mbps" lat="0ms"
+           bb_bw="200Mbps" bb_lat="0ms"/>
 </AS>
 </platform>

diff --git a/doc/Layout.xml b/doc/Layout.xml
index 385846f..d2983b6 100644 (file)
--- a/doc/Layout.xml
+++ b/doc/Layout.xml
@@ -7,7 +7,7 @@
       <tab type="user" visible="yes" url="@ref help" title="Getting help" />
     </tab>
     <tab type="mainpage" visible="yes" title="SimGrid User Documentation" />
-  
+
     <!--<tab type="pages" visible="yes" title="Table Of Content" intro="Complete pages list">-->
       <!--<tab type="pages" visible="yes" title="Table Of Content" intro="Complete pages list"/>-->
     <!--</tab>-->

diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt
index 3c461f3..3dabea0 100644 (file)
--- a/examples/java/masterslave/CMakeLists.txt
+++ b/examples/java/masterslave/CMakeLists.txt
@@ -33,9 +33,6 @@ set(examples_src
   ${examples_src}
   ${sources}
   PARENT_SCOPE)
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/README

diff --git a/examples/java/masterslave/masterslaveDeployment.xml b/examples/java/masterslave/masterslaveDeployment.xml
index 058820e..5f249f1 100644 (file)
--- a/examples/java/masterslave/masterslaveDeployment.xml
+++ b/examples/java/masterslave/masterslaveDeployment.xml
@@ -7,7 +7,7 @@
      <argument value="10"/>    <!-- Communication size of each one -->
      <argument value="7"/>     <!-- Amount of slaves waiting for orders -->
   </process>
-  
+
   <process host="Jackson" function="masterslave.Forwarder">
      <argument value="0"/>  <!-- Input mailbox -->
      <argument value="7"/>  <!-- First output mailbox -->
@@ -18,32 +18,14 @@
      <argument value="9"/>  <!-- First output mailbox -->
      <argument value="10"/> <!-- Last output mailbox -->
   </process>
-  
-  <process host="iRMX" function="masterslave.Slave">
-     <argument value="2"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Bousquet" function="masterslave.Slave">
-     <argument value="3"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Soucy" function="masterslave.Slave">
-     <argument value="4"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Kuenning" function="masterslave.Slave">
-     <argument value="5"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Browne" function="masterslave.Slave">
-     <argument value="6"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Stephen" function="masterslave.Slave">
-     <argument value="7"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Robert" function="masterslave.Slave">
-     <argument value="8"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Sirois" function="masterslave.Slave">
-     <argument value="9"/>  <!-- Input mailbox -->
-  </process>  
-  <process host="Monique" function="masterslave.Slave">
-     <argument value="10"/>  <!-- Input mailbox -->
-  </process>  
+
+  <process host="iRMX" function="masterslave.Slave">      <argument value="2"/>  <!-- Input mailbox --> </process>
+  <process host="Bousquet" function="masterslave.Slave">  <argument value="3"/>  <!-- Input mailbox --> </process>
+  <process host="Soucy" function="masterslave.Slave">     <argument value="4"/>  <!-- Input mailbox --> </process>
+  <process host="Kuenning" function="masterslave.Slave">  <argument value="5"/>  <!-- Input mailbox --> </process>
+  <process host="Browne" function="masterslave.Slave">    <argument value="6"/>  <!-- Input mailbox --> </process>
+  <process host="Stephen" function="masterslave.Slave">   <argument value="7"/>  <!-- Input mailbox --> </process>
+  <process host="Robert" function="masterslave.Slave">    <argument value="8"/>  <!-- Input mailbox --> </process>
+  <process host="Sirois" function="masterslave.Slave">    <argument value="9"/>  <!-- Input mailbox --> </process>
+  <process host="Monique" function="masterslave.Slave">   <argument value="10"/> <!-- Input mailbox --> </process>
 </platform>

diff --git a/examples/msg/masterslave/deployment_masterslave_mailbox.xml b/examples/msg/masterslave/deployment_masterslave_mailbox.xml
index f0be059..5bd6985 100644 (file)
--- a/examples/msg/masterslave/deployment_masterslave_mailbox.xml
+++ b/examples/msg/masterslave/deployment_masterslave_mailbox.xml
@@ -9,19 +9,9 @@
      <argument value="5"/>         <!-- Number of slaves -->
   </process>
   <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">
-    <argument value="0"/>
-  </process>
-  <process host="Jupiter" function="slave">
-    <argument value="1"/>
-  </process>
-  <process host="Fafard" function="slave">
-    <argument value="2"/>
-  </process>
-  <process host="Ginette" function="slave">
-    <argument value="3"/>
-  </process>
-  <process host="Bourassa" function="slave">
-    <argument value="4"/>
-  </process>
+  <process host="Tremblay" function="slave">  <argument value="0"/> </process>
+  <process host="Jupiter" function="slave">   <argument value="1"/> </process>
+  <process host="Fafard" function="slave">    <argument value="2"/> </process>
+  <process host="Ginette" function="slave">   <argument value="3"/> </process>
+  <process host="Bourassa" function="slave">  <argument value="4"/> </process>
 </platform>

diff --git a/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml b/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
index 571ec4a..e7e5e22 100644 (file)
--- a/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
+++ b/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
@@ -9,22 +9,10 @@
      <argument value="6"/>         <!-- Number of slaves -->
   </process>
   <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">
-    <argument value="0"/>
-  </process>
-  <process host="Tremblay" function="slave">
-    <argument value="1"/>
-  </process>
-  <process host="Tremblay" function="slave">
-    <argument value="2"/>
-  </process>
-  <process host="Tremblay" function="slave">
-    <argument value="3"/>
-  </process>
-  <process host="Tremblay" function="slave">
-    <argument value="4"/>
-  </process>
-  <process host="Tremblay" function="slave">
-    <argument value="5"/>
-  </process>
+  <process host="Tremblay" function="slave">   <argument value="0"/> </process>
+  <process host="Tremblay" function="slave">   <argument value="1"/> </process>
+  <process host="Tremblay" function="slave">   <argument value="2"/> </process>
+  <process host="Tremblay" function="slave">   <argument value="3"/> </process>
+  <process host="Tremblay" function="slave">   <argument value="4"/> </process>
+  <process host="Tremblay" function="slave">   <argument value="5"/> </process>
 </platform>

diff --git a/tools/internal/eclipse-formating.xml b/tools/internal/eclipse-formating.xml
index 0e3e36e..330a41c 100644 (file)
--- a/tools/internal/eclipse-formating.xml
+++ b/tools/internal/eclipse-formating.xml
@@ -3,7 +3,7 @@
 <!-- This file is an eclipse configuration file, to setup the code formater.
      Open the properties of your SimGrid project, "C/C++ General" -> "Formatter"
      Then, enable project-specific settings, and import this file. -->
-     
+
 <profiles version="1">
 <profile kind="CodeFormatterProfile" name="SimGrid" version="1">
 <setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification" value="do not insert"/>