Change way to make tesh for win32.

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

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 4f8d0e9..e867037 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -1,13 +1,14 @@
+

 if(enable_memcheck)
 include(FindValgrind)
 endif(enable_memcheck)
 
 if(enable_memcheck)
 include(FindValgrind)
 endif(enable_memcheck)
 

-if(enable_smpi)
+if(enable_smpi AND NOT WIN32)

        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")

-endif(enable_smpi)
+endif(enable_smpi AND NOT WIN32)

 
 ### For code coverage
 ### Set some variables
 
 ### For code coverage
 ### Set some variables

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 132869d..7936f93 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -800,6 +800,7 @@ set(bin_files
 tools/MSG_visualization/colorize.pl
 tools/sg_unit_extractor.pl
 tools/simgrid_update_xml.pl
 tools/MSG_visualization/colorize.pl
 tools/sg_unit_extractor.pl
 tools/simgrid_update_xml.pl

+buildtools/Cmake/tesh.pl

 )
 
 # This is the complete lise of what will be added to the source archive
 )
 
 # This is the complete lise of what will be added to the source archive

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 41b88fd..e213f97 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -20,17 +20,10 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpiff
                  ${CMAKE_BINARY_DIR}/bin/smpirun
                DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
                  ${CMAKE_BINARY_DIR}/bin/smpiff
                  ${CMAKE_BINARY_DIR}/bin/smpirun
                DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)

-if(WIN32)
-       install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
-       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
-       RENAME tesh)
-       add_custom_target(tesh
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
-       )
-else(WIN32)
-       install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
-       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
-endif(WIN32)  
+
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
+DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+

        
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
         DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
        
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
         DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 2e6d0ce..12e431e 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -164,7 +164,16 @@ endif(enable_lib_static)
 ### Load all files declaring binaries (tools, examples and tests) #
 ###################################################################
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)
 ### Load all files declaring binaries (tools, examples and tests) #
 ###################################################################
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)

-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+
+if(WIN32)
+       add_custom_target(tesh ALL
+       DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
+       COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl"
+       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
+       )
+else(WIN32)
+       add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+endif(WIN32)

 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)

diff --git a/buildtools/Cmake/tesh.pl b/buildtools/Cmake/tesh.pl
old mode 100644 (file)
new mode 100755 (executable)
index d4e4c99..a1ec8af
--- a/buildtools/Cmake/tesh.pl
+++ b/buildtools/Cmake/tesh.pl
@@ -1,16 +1,26 @@
-#!perl -w\r
+#! /usr/bin/perl -w\r
+\r

 use strict;\r
 \r
 use strict;\r
 \r

-if($#ARGV!=1){die "Usage: perl tesh.pl <directory> <teshfile.tesh>\n";}\r
-my($directory)=$ARGV[0];\r
-my($file)=$ARGV[1];\r
+if($#ARGV!=2){die "Usage: tesh.pl --cd <directory> <teshfile.tesh>\n";}\r

 my($line1);\r
 my($line2);\r
 my($execline);\r
 my($ok)=0;\r
 my($line1);\r
 my($line2);\r
 my($execline);\r
 my($ok)=0;\r

-chdir("$directory");\r
-print "Change directory to \"$directory\"\n";\r
+my($nb_arg)=0;\r
+\r
+do{\r
+       if($ARGV[$nb_arg] =~ /^--cd$/)\r
+       {\r
+               $nb_arg++;\r
+               my($directory)=$ARGV[$nb_arg];\r
+               chdir("$directory");\r
+               print "Change directory to \"$directory\"\n";   \r
+       }\r
+       $nb_arg++;\r
+}while(($nb_arg-1)!=$#ARGV);\r

 \r
 \r

+my($file)=$ARGV[$nb_arg-1];\r

 open SH_LIGNE, $file or die "Unable to open $file. $!\n";\r
 \r
 while(defined($line1=<SH_LIGNE>))\r
 open SH_LIGNE, $file or die "Unable to open $file. $!\n";\r
 \r
 while(defined($line1=<SH_LIGNE>))\r


@@ -25,6 +35,8 @@ while(defined($line1=<SH_LIGNE>))
                        $line1 =~ s/^\$\ *//g;\r
                        $line1 =~ s/^.\/lua/lua/g;\r
                        $line1 =~ s/^.\/ruby/ruby/g;\r
                        $line1 =~ s/^\$\ *//g;\r
                        $line1 =~ s/^.\/lua/lua/g;\r
                        $line1 =~ s/^.\/ruby/ruby/g;\r

+                       \r
+                       $line1 =~ s/\(%i:%P@%h\)/\\\(%i:%P@%h\\\)/g;\r

                        chomp $line1;\r
                        $execline = $line1;\r
                        print "$execline\n";\r
                        chomp $line1;\r
                        $execline = $line1;\r
                        print "$execline\n";\r


@@ -56,10 +68,17 @@ while(defined($line1=<SH_LIGNE>))
                                {if(!defined($line2=<FILE_ERR>))\r
                                        {       print "- $line1\n";\r
                                                die;}}\r
                                {if(!defined($line2=<FILE_ERR>))\r
                                        {       print "- $line1\n";\r
                                                die;}}\r

-                       else{if(!defined($line2=<FILE>))\r
+                       elsif($line1 =~ /^.*\[.*\].*\[0\:\@\].*$/)\r
+                               {if(!defined($line2=<FILE_ERR>))\r

                                        {       print "- $line1\n";\r
                                                die;}}\r
                                        {       print "- $line1\n";\r
                                                die;}}\r

-                       \r
+                       elsif($line1 =~ /^.*\[.*\].*\(0\:\@\).*$/)\r
+                               {if(!defined($line2=<FILE_ERR>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}\r
+                       else{if(!defined($line2=<FILE>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}          \r

                        $line2 =~ s/\r//g;                                                      \r
                        chomp $line2;\r
                        \r
                        $line2 =~ s/\r//g;                                                      \r
                        chomp $line2;\r
                        \r