From: Jan Michel <j.michel@gsi.de>
Date: Tue, 23 Jun 2015 15:56:23 +0000 (+0200)
Subject: nodelist file is given by compile configuration, no symlink needed
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a208ca8640a8f4a909efb864708d073d7f9f1a58;p=trb3sc.git

nodelist file is given by compile configuration, no symlink needed
---

diff --git a/scripts/compile.pl b/scripts/compile.pl
index 028f37f..4e39445 100755
--- a/scripts/compile.pl
+++ b/scripts/compile.pl
@@ -23,6 +23,7 @@ my $include_TDC                  = $config{include_TDC} || 0;
 my $include_GBE                  = $config{include_GBE} || 0;
 my $twr_number_of_errors         = $config{twr_number_of_errors} || 10;
 my $pinout_file                  = $config{pinout_file} || $TOPNAME;
+my $nodelist_file                = $config{nodelist_file} || 'nodelist.txt';
 
 ###################################################################################
 #Settings for this project
@@ -252,7 +253,7 @@ if($par==1 || $all==1){
     system("rm $TOPNAME.ncd");
     if ($isMultiPar)
     {
-        $c=qq|LC_ALL=en_US.UTF-8; par -m ../nodelist.txt -n $nrNodes  -f "../par.p2t" $tpmap.ncd $TOPNAME.dir $TOPNAME.prf;|;
+        $c=qq|LC_ALL=en_US.UTF-8; par -m ../../scripts/$nodelist_file -n $nrNodes  -f "../par.p2t" $tpmap.ncd $TOPNAME.dir $TOPNAME.prf;|;
         execute($c);
 
         # find and copy the .ncd file which has met the timing constraints
diff --git a/template/config_compile_frankfurt.pl b/template/config_compile_frankfurt.pl
index 7eaea2c..19a7f88 100644
--- a/template/config_compile_frankfurt.pl
+++ b/template/config_compile_frankfurt.pl
@@ -6,6 +6,8 @@ synplify_path                => '/d/jspc29/lattice/synplify/J-2014.09-SP2/',
 synplify_command             => "/d/jspc29/lattice/diamond/3.4_x64/bin/lin64/synpwrap -fg -options",
 #synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",
 
+nodelist_file                => 'nodelist_frankfurt.txt',
+
 
 #Include only necessary lpf files
 #pinout_file                  => '', #name of pin-out file, if not equal TOPNAME
@@ -16,4 +18,3 @@ include_GBE                  => 0,
 firefox_open                 => 0,
 twr_number_of_errors         => 20,
 
-
diff --git a/template/config_compile_gsi.pl b/template/config_compile_gsi.pl
index b9f3af9..28fc49c 100644
--- a/template/config_compile_gsi.pl
+++ b/template/config_compile_gsi.pl
@@ -6,6 +6,7 @@ synplify_path                => '/opt/synplicity/J-2014.09-SP2',
 #synplify_command             => "/opt/lattice/diamond/3.4_x64/bin/lin64/synpwrap -fg -options",
 synplify_command             => "/opt/synplicity/J-2014.09-SP2/bin/synplify_premier_dp",
 
+nodelist_file                => 'nodelist_lxhadeb07.txt',
 
 firefox_open                 => 0,
 
diff --git a/template/nodelist.txt b/template/nodelist.txt
deleted file mode 120000
index 072269e..0000000
--- a/template/nodelist.txt
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/nodes_frankfurt.txt
\ No newline at end of file