cosmetics: mv tools/cmake/Scripts tools/cmake/scripts

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 7a4fecf..226c3fb 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -119,7 +119,7 @@ public final class NativeLib {
 
        public static void main(String[] args) {
                if (args.length >= 1 && args[0].equals("--quiet"))
-                       /* be careful, this execution path is used in tools/cmake/Scripts/java_bundle.sh to determine where to put the libs */
+                       /* be careful, this execution path is used in tools/cmake/scripts/java_bundle.sh to determine where to put the libs */
                        System.out.println(getPath());
                else 
                        System.out.println("This java library will try to load the native code under the following name:\n" +getPath());

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e59197d..5397b2e 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1206,15 +1206,15 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Option.cmake
   tools/cmake/Pipol.cmake
   tools/cmake/PrintArgs.cmake
-  tools/cmake/Scripts/Diff.pm
-  tools/cmake/Scripts/Makefile.default
-  tools/cmake/Scripts/SimGrid.packproj
-  tools/cmake/Scripts/generate_memcheck_tests.pl
-  tools/cmake/Scripts/java_bundle.sh
-  tools/cmake/Scripts/my_valgrind.pl
-  tools/cmake/Scripts/postinstall.sh
-  tools/cmake/Scripts/preinstall.sh
-  tools/cmake/Scripts/update_tesh.pl
+  tools/cmake/scripts/Diff.pm
+  tools/cmake/scripts/Makefile.default
+  tools/cmake/scripts/SimGrid.packproj
+  tools/cmake/scripts/generate_memcheck_tests.pl
+  tools/cmake/scripts/java_bundle.sh
+  tools/cmake/scripts/my_valgrind.pl
+  tools/cmake/scripts/postinstall.sh
+  tools/cmake/scripts/preinstall.sh
+  tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
   tools/cmake/src/internal_config.h.in
   tools/cmake/src/simgrid.nsi.in

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 29ab476..5d5b40d 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -277,7 +277,7 @@ endforeach(file ${source_to_pack})
 
 add_custom_command(
   TARGET dist-dir
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
   COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion
   )
 

diff --git a/tools/cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake
index 6011d0d..8939774 100644 (file)
--- a/tools/cmake/MakeJava.cmake
+++ b/tools/cmake/MakeJava.cmake
@@ -81,7 +81,7 @@ else()
   add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
 endif()
 
-set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/java_bundle.sh")
+set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/java_bundle.sh")
 set(JAVA_BUNDLE_SO_FILES
   ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
   ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO}

diff --git a/tools/cmake/Modules/FindValgrind.cmake b/tools/cmake/Modules/FindValgrind.cmake
index 2ab4e38..6b02522 100644 (file)
--- a/tools/cmake/Modules/FindValgrind.cmake
+++ b/tools/cmake/Modules/FindValgrind.cmake
@@ -11,8 +11,8 @@ find_program(VALGRIND_EXE
 
 if(VALGRIND_EXE)
   message(STATUS "Found valgrind: ${VALGRIND_EXE}")
-  SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/my_valgrind.pl")
-  SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/my_valgrind.pl")
+  SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/my_valgrind.pl")
+  SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/my_valgrind.pl")
 endif()
 
 if(enable_memcheck_xml)
@@ -24,7 +24,7 @@ if(VALGRIND_EXE)
   string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
   if(NEW_VALGRIND_VERSION)
     message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
-    exec_program("${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
+    exec_program("${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
     set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --trace-children-skip=/usr/bin/*,/bin/* --leak-check=full --show-reachable=yes --track-origins=no --read-var-info=no --num-callers=20 --suppressions=${CMAKE_HOME_DIRECTORY}/tools/simgrid.supp ${VALGRIND_EXTRA_COMMAND_OPTIONS} ")
     message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
   else()

diff --git a/tools/cmake/Scripts/Diff.pm b/tools/cmake/scripts/Diff.pm
similarity index 100%
rename from tools/cmake/Scripts/Diff.pm
rename to tools/cmake/scripts/Diff.pm

diff --git a/tools/cmake/Scripts/Makefile.default b/tools/cmake/scripts/Makefile.default
similarity index 100%
rename from tools/cmake/Scripts/Makefile.default
rename to tools/cmake/scripts/Makefile.default

diff --git a/tools/cmake/Scripts/SimGrid.packproj b/tools/cmake/scripts/SimGrid.packproj
similarity index 100%
rename from tools/cmake/Scripts/SimGrid.packproj
rename to tools/cmake/scripts/SimGrid.packproj

diff --git a/tools/cmake/Scripts/generate_memcheck_tests.pl b/tools/cmake/scripts/generate_memcheck_tests.pl
similarity index 100%
rename from tools/cmake/Scripts/generate_memcheck_tests.pl
rename to tools/cmake/scripts/generate_memcheck_tests.pl

diff --git a/tools/cmake/Scripts/java_bundle.sh b/tools/cmake/scripts/java_bundle.sh
similarity index 100%
rename from tools/cmake/Scripts/java_bundle.sh
rename to tools/cmake/scripts/java_bundle.sh

diff --git a/tools/cmake/Scripts/my_valgrind.pl b/tools/cmake/scripts/my_valgrind.pl
similarity index 100%
rename from tools/cmake/Scripts/my_valgrind.pl
rename to tools/cmake/scripts/my_valgrind.pl

diff --git a/tools/cmake/Scripts/postinstall.sh b/tools/cmake/scripts/postinstall.sh
similarity index 100%
rename from tools/cmake/Scripts/postinstall.sh
rename to tools/cmake/scripts/postinstall.sh

diff --git a/tools/cmake/Scripts/preinstall.sh b/tools/cmake/scripts/preinstall.sh
similarity index 100%
rename from tools/cmake/Scripts/preinstall.sh
rename to tools/cmake/scripts/preinstall.sh

diff --git a/tools/cmake/Scripts/update_tesh.pl b/tools/cmake/scripts/update_tesh.pl
similarity index 100%
rename from tools/cmake/Scripts/update_tesh.pl
rename to tools/cmake/scripts/update_tesh.pl

diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt
index 7422749..460f09d 100644 (file)
--- a/tools/tesh/CMakeLists.txt
+++ b/tools/tesh/CMakeLists.txt
@@ -1,7 +1,7 @@
 configure_file("${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.pl"
   "${CMAKE_BINARY_DIR}/bin/tesh" @ONLY IMMEDIATE)
 
-    file(COPY        ${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/Diff.pm
+    file(COPY        ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/Diff.pm
          DESTINATION ${CMAKE_BINARY_DIR}/bin
          FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                           GROUP_EXECUTE GROUP_READ)