Rename GROS to XBT, thanks Arnaud ;)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@440 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/Makefile.am b/include/Makefile.am
index 7572a09..b818108 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,10 +1,10 @@
-include_HEADERS = gras.h gros.h
+include_HEADERS = gras.h xbt.h
 nobase_include_HEADERS = \
-       gros/sysdep.h \
-       gros/log.h gros/error.h \
-       gros/module.h \
-       gros/dynar.h gros/dict.h gros/set.h \
-       gros/config.h \
+       xbt/sysdep.h \
+       xbt/log.h xbt/error.h \
+       xbt/module.h \
+       xbt/dynar.h xbt/dict.h xbt/set.h \
+       xbt/config.h \
        \
        gras/datadesc.h gras/transport.h \
        gras/virtu.h gras/cond.h gras/process.h \

diff --git a/include/gras.h b/include/gras.h
index 347e1da..4420bce 100644 (file)
--- a/include/gras.h
+++ b/include/gras.h
@@ -11,7 +11,7 @@
 #ifndef GRAS_H
 #define GRAS_H
 
-#include <gros.h> /* our toolbox */
+#include <xbt.h> /* our toolbox */
 
 #include <gras/core.h> /* FIXME: killme */
 #include <gras/process.h>

diff --git a/include/xbt.h b/include/xbt.h
index 81c0fe1..083286d 100644 (file)
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-/* gros.h - Public interface to the GROS (gras's toolbox)                   */
+/* xbt.h - Public interface to the xbt (gras's toolbox)                   */
 
 /* Authors: Martin Quinson                                                  */
 /* Copyright (C) 2004 the OURAGAN project.                                  */
@@ -8,8 +8,8 @@
 /* This program is free software; you can redistribute it and/or modify it
    under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef GROS_H
-#define GROS_H
+#ifndef xbt_H
+#define xbt_H
 
 #define max(a, b) (((a) > (b))?(a):(b))
 #define min(a, b) (((a) < (b))?(a):(b))
@@ -19,17 +19,17 @@
 
 #define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
 
-#include <gros/sysdep.h>
+#include <xbt/sysdep.h>
 
-#include <gros/error.h>
-#include <gros/log.h>
+#include <xbt/error.h>
+#include <xbt/log.h>
 
-#include <gros/module.h>
+#include <xbt/module.h>
 
-#include <gros/dynar.h>
-#include <gros/dict.h>
-#include <gros/set.h>
+#include <xbt/dynar.h>
+#include <xbt/dict.h>
+#include <xbt/set.h>
 
-#include <gros/config.h>
+#include <xbt/config.h>
 
-#endif /* GROS_H */
+#endif /* xbt_H */

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c1b529..b68f89d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= -I$(top_srcdir)/include \
 EXTRA_DIST= \
         gras_private.h\
         \
-        gros/dict_private.h \
+        xbt/dict_private.h \
         \
        gras/Transport/transport_interface.h \
        gras/Virtu/virtu_interface.h \
@@ -74,14 +74,14 @@ endif
 
 COMMON_S=\
   \
-  gros/gros_interface.h                                                         \
-  gros/sysdep.c                                                                 \
-  gros/log.c         gros/log_default_appender.c   gros/error.c                 \
-  gros/dynar.c                                                                  \
-  gros/dict.c        gros/dict_elm.c               gros/dict_cursor.c           \
-  gros/set.c                                                                    \
-  gros/module.c                                                                 \
-  gros/config.c                                                                 \
+  xbt/xbt_interface.h                                                         \
+  xbt/sysdep.c                                                                 \
+  xbt/log.c         xbt/log_default_appender.c   xbt/error.c                 \
+  xbt/dynar.c                                                                  \
+  xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
+  xbt/set.c                                                                    \
+  xbt/module.c                                                                 \
+  xbt/config.c                                                                 \
   \
   \
   gras/Transport/transport.c          gras/Transport/transport_private.h   gras/Transport/transport_plugin_buf.c  \

diff --git a/src/gras_private.h b/src/gras_private.h
index 9a4d4d5..5d1e6b5 100644 (file)
--- a/src/gras_private.h
+++ b/src/gras_private.h
@@ -21,15 +21,15 @@
 
 #include "gras_config.h"
 
-#include "gros/sysdep.h"
-
-#include "gros/error.h"
-#include "gros/log.h"
-#include "gros/module.h"
-#include "gros/dynar.h"
-#include "gros/dict.h"
-#include "gros/set.h"
-#include "gros/config.h"
+#include "xbt/sysdep.h"
+
+#include "xbt/error.h"
+#include "xbt/log.h"
+#include "xbt/module.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+#include "xbt/set.h"
+#include "xbt/config.h"
 
 #include "gras/core.h"
 #include "gras/process.h"

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 69d8654..6da5a7f 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o datadesc_usage.out 
-DISTCLEANFILES =  gras/.libs/* gros/.libs/*
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/*
 MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
   gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
@@ -10,13 +10,13 @@ EXTRA_DIST=run_tests.in \
 
 # Test stuff
 
-gros_tests =                                                      \
-       gros/dynar_int    gros/dynar_double   gros/dynar_string   \
-       gros/dict_usage   gros/dict_crash                         \
-       gros/set_usage                                            \
-       gros/log_usage                                            \
-       gros/config_usage
-# gros/multidict_crash 
+xbt_tests =                                                      \
+       xbt/dynar_int    xbt/dynar_double   xbt/dynar_string   \
+       xbt/dict_usage   xbt/dict_crash                         \
+       xbt/set_usage                                            \
+       xbt/log_usage                                            \
+       xbt/config_usage
+# xbt/multidict_crash 
 
 RL_tests =                                              \
        gras/trp_tcp_client   gras/trp_tcp_server       \
@@ -25,7 +25,7 @@ RL_tests =                                              \
 
 SG_tests =
 
-check_PROGRAMS = $(gros_tests) $(RL_tests) $(SG_tests)
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
@@ -38,19 +38,19 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 LDADD_UTILS=$(top_builddir)/src/libgrasrl.la 
 LDADD_RL=   $(top_builddir)/src/libgrasrl.la   
 
-gros_log_usage_LDADD=          $(LDADD_UTILS)
+xbt_log_usage_LDADD=          $(LDADD_UTILS)
 
-gros_dynar_int_LDADD=          $(LDADD_UTILS)
-gros_dynar_double_LDADD=       $(LDADD_UTILS)
-gros_dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_dynar_int_LDADD=          $(LDADD_UTILS)
+xbt_dynar_double_LDADD=       $(LDADD_UTILS)
+xbt_dynar_string_LDADD=       $(LDADD_UTILS)
 
-gros_dict_usage_LDADD=         $(LDADD_UTILS)
-gros_dict_crash_LDADD=         $(LDADD_UTILS)
-#gros_multidict_crash_LDADD=    $(LDADD_UTILS)
+xbt_dict_usage_LDADD=         $(LDADD_UTILS)
+xbt_dict_crash_LDADD=         $(LDADD_UTILS)
+#xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
 
-gros_set_usage_LDADD=          $(LDADD_UTILS)
+xbt_set_usage_LDADD=          $(LDADD_UTILS)
 
-gros_config_usage_LDADD=       $(LDADD_UTILS)
+xbt_config_usage_LDADD=       $(LDADD_UTILS)
 
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 339097c..2cbcb50 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -11,10 +11,10 @@ if [ xvalgrind = "x$1" ] ; then
 else
   valgrind=
 fi
-for test in gros/log_usage                                          \
-            gros/dynar_int gros/dynar_double gros/dynar_string      \
-           gros/dict_usage gros/dict_crash                         \
-           gros/config_usage                                       \
+for test in xbt/log_usage                                          \
+            xbt/dynar_int xbt/dynar_double xbt/dynar_string      \
+           xbt/dict_usage xbt/dict_crash                         \
+           xbt/config_usage                                       \
            \
            gras/trp_tcp_usage      gras/trp_file_usage             \
            gras/datadesc_usage