Rename some variales and cosmetics.

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

diff --git a/.gitignore b/.gitignore
index 6337269..33facad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,10 @@ examples/msg/z_gtnets.trace
 examples/msg/tracing/procmig
 examples/msg/tracing/tasks
 examples/msg/tracing/volume
+examples/msg/mc/bugged3
+examples/msg/mc/random_test
+examples/simdag/ex_sd_seq_access
+examples/simdag/sd_seq_access
 
 src/simgrid_units_main.c
 *_unit.c
@@ -187,6 +191,7 @@ src/context_sysv_config.h
 src/gras_config.h
 src/smpi/smpicc
 src/smpi/smpirun
+src/bindings/lua/libsimgrid.so
 src/testall
 src/ucontext_stack.h
 teshsuite/datadesc_usage.out
@@ -238,4 +243,5 @@ tools/tesh/tesh
 examples/msg/tracing/categories
 examples/msg/tracing/ms
 
-
+.cproject
+.project

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16e7892..ad6b932 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
 #SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src") #this one is evil since it speaks to CPack instead
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index efec41e..8e66ac8 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -574,7 +574,7 @@ file(GLOB_RECURSE add_src_files
 "examples/*.java"
 )
 
-file(GLOB_RECURSE ex_to_svg
+file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
 "examples/*.cxx"
@@ -585,20 +585,20 @@ file(GLOB_RECURSE ex_to_svg
 "examples/*.java"
 "examples/*.xml"
 )
-string(REPLACE "" "" ex_to_svg "${ex_to_svg}")
-foreach(file ${ex_to_svg})
+string(REPLACE "" "" examples_to_install_in_doc "${examples_to_install_in_doc}")
+foreach(file ${examples_to_install_in_doc})
        string(REGEX REPLACE "/[^/]*$" "" file "${file}")
-       set(new_ex_to_svg "${new_ex_to_svg}${file};")
-endforeach(file ${ex_to_svg})
+       set(new_examples_to_install_in_doc "${new_examples_to_install_in_doc}${file};")
+endforeach(file ${examples_to_install_in_doc})
 
 set(directory_to_create "")
 
-foreach(file ${new_ex_to_svg})
+foreach(file ${new_examples_to_install_in_doc})
        string(REGEX MATCH "${file};" OPERATION "${directory_to_create}")
        if(NOT OPERATION)
                set(directory_to_create "${directory_to_create}${file};")
        endif(NOT OPERATION)
-endforeach(file ${new_ex_to_svg})
+endforeach(file ${new_examples_to_install_in_doc})
 
 
 file(GLOB_RECURSE include_files
@@ -699,7 +699,7 @@ file(GLOB_RECURSE txt_files
 
 
 # This is the complete lise of what will be added to the source archive
-set(to_svg     
+set(source_to_pack     
        ${XBT_RL_SRC}
        ${EXTRA_DIST}
        ${SMPI_SRC}
@@ -762,10 +762,7 @@ set(to_svg
        buildtools/Cmake/prog_test/prog_vsnprintf.c
        # FIXME: these are badly named and placed
        buildtools/Cmake/src/c_gras_config.h.in
-       buildtools/Cmake/src/tmp_gras_config.h.in
        buildtools/Cmake/src/tracing_config.h.in
-       buildtools/Cmake/src/tmp_tracing_config.h.in
-       
        
        AUTHORS
        ChangeLog

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 8835092..f8f9166 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -1,16 +1,3 @@
-set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
-set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
-set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
-
-set(CPACK_PACKAGE_FILE_NAME "simgrid-${release_version}")
-set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
-set(CPACK_GENERATOR "") #;TGZ;TZ;ZIP
-
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-src")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_FILES "${to_svg}")
-
-set(CPACK_SET_DESTDIR on)
 set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 
 #########################################
@@ -59,12 +46,12 @@ foreach(file ${install_HEADERS})
 endforeach(file ${install_HEADERS})
 
 # example files
-foreach(file ${ex_to_svg})
+foreach(file ${examples_to_install_in_doc})
   string(REPLACE "${PROJECT_DIRECTORY}/examples/" "" file ${file})
   get_filename_component(location ${file} PATH)
   install(FILES "examples/${file}"
           DESTINATION $ENV{DESTDIR}${prefix}/doc/simgrid/examples/${location})
-endforeach(file ${ex_to_svg})
+endforeach(file ${examples_to_install_in_doc})
 
 # bindings cruft
 if(HAVE_JAVA)
@@ -152,6 +139,11 @@ WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
 ##   containing only the files that I explicitely state      ###
 ##   (instead of any cruft laying on my disk as CPack does)  ###
 ################################################################
+
+##########################################
+### Fill in the "make dist-dir" target ###
+##########################################
+
 add_custom_target(dist-dir
   COMMAND test -e simgrid-${release_version}/ && chmod -R a+w simgrid-${release_version}/ || true
   COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}
@@ -159,7 +151,7 @@ add_custom_target(dist-dir
 )
 
 set(dirs_in_tarball "")
-foreach(file ${to_svg} ${txt_files})
+foreach(file ${source_to_pack} ${txt_files})
   # This damn prefix is still set somewhere (seems to be in subdirs)
   string(REPLACE "${PROJECT_DIRECTORY}/" "" file ${file})
   
@@ -179,7 +171,11 @@ foreach(file ${to_svg} ${txt_files})
      TARGET dist-dir
      COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/${file} simgrid-${release_version}/${file_location}/
    )
-endforeach(file ${to_svg})
+endforeach(file ${source_to_pack})
+
+######################################
+### Fill in the "make dist" target ###
+######################################
 
 add_custom_target(dist
   COMMAND ${CMAKE_COMMAND} -E tar cf simgrid-${release_version}.tar simgrid-${release_version}/
@@ -188,6 +184,10 @@ add_custom_target(dist
 )
 add_dependencies(dist dist-dir)
 
+###########################################
+### Fill in the "make distcheck" target ###
+###########################################
+
 # Allow to test the "make dist"
 add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_build

diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt
index d9862fc..406e98d 100644 (file)
--- a/tools/gras/CMakeLists.txt
+++ b/tools/gras/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+
 add_executable(gras_stub_generator stub_generator.c unix_stub_generator.c windows_stub_generator.c)
 
 ### Add definitions for compile