changeset 669:e8800c60811a

fix search cbc file
author anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Wed, 19 Aug 2020 08:05:53 +0900
parents 6c07eb2d4d39
children f8b98e469256
files src/parallel_execution/generate_stub.pl
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/generate_stub.pl	Tue Aug 18 21:59:47 2020 +0900
+++ b/src/parallel_execution/generate_stub.pl	Wed Aug 19 08:05:53 2020 +0900
@@ -3,8 +3,7 @@
 use strict;
 use Getopt::Long;
 use File::Path qw(make_path);
-use File::Basename qw/basename/;
-use File::Basename;
+use File::Basename qw/basename dirname/;
 use File::Spec qw/rel2abs/;
 
 
@@ -141,11 +140,8 @@
                 }
             } elsif(/^(.*)par goto (\w+)\((.*)\)/) {
                 my $codeGearName = $2;
-                if ($filename =~ /^(.*)\/(.*)/) {
-                    $codeGearName = "$1/$codeGearName";
-                }
                 if ($search_cbc_from_code_gear_and_filename->($codeGearName, $filename)) {
-                    &getDataGear($search_cbc_from_code_gear_and_filename->($codeGearName, $filename));
+                    &getCodeGear($search_cbc_from_code_gear_and_filename->($codeGearName, $filename));
                 }
             } elsif(/^#interface "(.*)"/) {
                 # use interface
@@ -788,6 +784,14 @@
     }
 
 
-    $filename = rel2abs($filename);
+    my $cbc_dir_name = dirname $filename;
+
+    for my $cbc_file (@cbc_files) {
+      if ($cbc_file =~ /$cbc_dir_name/) {
+        return $cbc_file;
+      }
+    }
+
+    return 0; # Not found
   }
 }