From: Cahit Date: Wed, 10 Jun 2015 14:23:52 +0000 (+0200) Subject: fixed conflict in the compile script X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=6b75604ca370b0bea1634388aebbe8ee679d79f1;p=trb3sc.git fixed conflict in the compile script --- 6b75604ca370b0bea1634388aebbe8ee679d79f1 diff --cc scripts/compile.pl index 39bb2b4,8f74a9f..bcdf1f0 --- a/scripts/compile.pl +++ b/scripts/compile.pl @@@ -111,13 -112,21 +112,23 @@@ system("ln -sfT $lattice_path $WORKDIR/ #create full lpf file print GREEN, "Generating constraints file...\n\n", RESET; system("cp ../pinout/$TOPNAME.lpf $WORKDIR/$TOPNAME.lpf"); - system("cat ../tdc_release/trbnet_constraints.lpf >> $WORKDIR/$TOPNAME.lpf"); - system("cat ../tdc_release/tdc_constraints_64.lpf >> $WORKDIR/$TOPNAME.lpf"); - system("cat ../tdc_release/unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf"); ++ + system("cat ../pinout/basic_constraints.lpf >> $WORKDIR/$TOPNAME.lpf"); + + if($include_TDC) { + system("cat ../tdc_release/trbnet_constraints.lpf >> $WORKDIR/$TOPNAME.lpf"); - system("cat ../tdc_release/tdc_constraints_script.lpf >> $WORKDIR/$TOPNAME.lpf"); ++ system("cat ../tdc_release/tdc_constraints_64.lpf >> $WORKDIR/$TOPNAME.lpf"); + system("cat ../tdc_release/unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf"); + } + if($include_GBE) { + + } #copy delay line to project folder - system("rm $WORKDIR/Adder_304.ngo"); - system("ln -s ../../../tdc/base/cores/ecp3/TDC/Adder_304.ngo $WORKDIR/Adder_304.ngo"); + if($include_TDC) { - system("ln -fs ../tdc_release/Adder_304.ngo $WORKDIR/"); ++ system("rm $WORKDIR/Adder_304.ngo"); ++ system("ln -s ../../../tdc/base/cores/ecp3/TDC/Adder_304.ngo $WORKDIR/Adder_304.ngo"); + } #generate timestamp my $t=time;