From b828d775b3045672358809aa67339a8128c1aff7 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 21 Mar 2014 20:58:43 +0100
Subject: [PATCH 1/1] Fix dist.

---
 buildtools/Cmake/DefinePackages.cmake         |  4 ++-
 .../java/org/simgrid/msg/NativeLib.java       | 28 -------------------
 testsuite/mc/CMakeLists.txt                   |  7 +++++
 tools/CMakeLists.txt                          |  2 ++
 tools/check_dist_archive.exclude              |  2 --
 generate.sh => tools/generate.sh              |  0
 6 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 src/bindings/java/org/simgrid/msg/NativeLib.java
 rename generate.sh => tools/generate.sh (100%)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 3b5ee1a049..2b446f2f25 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -568,9 +568,11 @@ set(MC_SRC
   src/mc/mc_compare.c
   src/mc/mc_dpor.c
   src/mc/mc_global.c
-  src/mc/mc_dwarf
+  src/mc/mc_dwarf.c
   src/mc/mc_member.c
+  src/mc/mc_dwarf_attrnames.h
   src/mc/mc_dwarf_expression.c
+  src/mc/mc_dwarf_tagnames.h
   src/mc/mc_liveness.c
   src/mc/mc_memory.c
   src/mc/mc_private.h
diff --git a/src/bindings/java/org/simgrid/msg/NativeLib.java b/src/bindings/java/org/simgrid/msg/NativeLib.java
deleted file mode 100644
index 151fb9532d..0000000000
--- a/src/bindings/java/org/simgrid/msg/NativeLib.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.simgrid.msg;
-
-public final class NativeLib {
-    public static String getPath() {
-        String prefix = "NATIVE";
-        String os = System.getProperty("os.name");
-        String arch = System.getProperty("os.arch");
-
-        if (os.toLowerCase().startsWith("^win"))
-            os = "Windows";
-        else if (os.contains("OS X"))
-            os = "Darwin";
-
-        if (arch.matches("^i[3-6]86$"))
-            arch = "x86";
-        else if (arch.equalsIgnoreCase("amd64"))
-            arch = "x86_64";
-
-        os = os.replace(' ', '_');
-        arch = arch.replace(' ', '_');
-
-        return prefix + "/" + os + "/" + arch + "/";
-    }
-
-    public static void main(String[] args) {
-        System.out.println(getPath());
-    }
-}
diff --git a/testsuite/mc/CMakeLists.txt b/testsuite/mc/CMakeLists.txt
index 3970c8864b..df0bc0b760 100644
--- a/testsuite/mc/CMakeLists.txt
+++ b/testsuite/mc/CMakeLists.txt
@@ -8,3 +8,10 @@ if(HAVE_MC)
   add_executable(dwarf-expression dwarf_expression.c)
   target_link_libraries(dwarf-expression simgrid)
 endif()
+
+set(testsuite_src
+  ${testsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dwarf.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/dwarf_expression.c
+  PARENT_SCOPE
+  )
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index ae1ccd244a..129ab69e86 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -3,7 +3,9 @@ cmake_minimum_required(VERSION 2.6)
 set(bin_files
   ${bin_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate.sh
   ${CMAKE_CURRENT_SOURCE_DIR}/indent
+  ${CMAKE_CURRENT_SOURCE_DIR}/normalize-pointers.py
   ${CMAKE_CURRENT_SOURCE_DIR}/platf_route_rulebased2full.py
   ${CMAKE_CURRENT_SOURCE_DIR}/sg_unit_extractor.pl
   ${CMAKE_CURRENT_SOURCE_DIR}/sg_xml_unit_converter.py
diff --git a/tools/check_dist_archive.exclude b/tools/check_dist_archive.exclude
index 8baa979b32..1082e69733 100644
--- a/tools/check_dist_archive.exclude
+++ b/tools/check_dist_archive.exclude
@@ -33,7 +33,6 @@
 + src/simix/simix_network\.tla
 
 + src/smpi/BUGS
-+ src/smpi/colls/allreduce-rab-reduce-scatter\.c
 + src/smpi/colls/alltoall-bruck\.c
 + src/smpi/fixsrc\.pl
 + src/smpi/myprintloc\.cocci
@@ -46,7 +45,6 @@
 + tools/check_dist_archive
 + tools/check_dist_archive\.exclude
 + tools/generate-multi-jar\.py
-+ tools/normalize-pointers\.py
 + tools/update_copyright_header
 
 + tools/spell/.*
diff --git a/generate.sh b/tools/generate.sh
similarity index 100%
rename from generate.sh
rename to tools/generate.sh
-- 
2.20.1