From: Jan Michel Date: Tue, 6 Aug 2013 16:19:12 +0000 (+0200) Subject: created Environment.pm with all important hardcoded settings X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=323d8d78ff2eddfc945a3585fbba178d48ff11d7;p=mvdsensorcontrol.git created Environment.pm with all important hardcoded settings --- 323d8d78ff2eddfc945a3585fbba178d48ff11d7 diff --cc tools/run.pl index 29c6dc3,e1e3f9c..55e62b2 --- a/tools/run.pl +++ b/tools/run.pl @@@ -7,7 -7,8 +7,12 @@@ use strict use warnings; use POSIX; use CGI ':standard'; ++<<<<<<< HEAD +# use Cwd; ++======= + + use Cwd; ++>>>>>>> 23c29745c883ce981ed72e273f6aac8ccccab503 use CGI::Carp qw(fatalsToBrowser); use HTML::Entities; # require Common; @@@ -30,20 -30,25 +39,37 @@@ print start_html -style=>{'src'=>'../layout/styles.css'} ); - # print h2("testgui"); - # print "

still more to come

"; + if( $q->param('runtime') ) { + $runtime = $q->param('runtime'); + } ++<<<<<<< HEAD +# print escapeHTML("hallo<<<>>>&&&!!"),br; +# print escapeHTML($here); +# $ENV{'PATH'}=$ENV{'PATH'}.":/home/hadaq/bin"; +# $ENV{'PATH'}=$ENV{'PATH'}.":/local.1/bastelstube/daqdata/bin"; ++======= + $ENV{'PATH'}=$ENV{'PATH'}.":/local.1/bastelstube/daqdata/bin"; ++>>>>>>> 23c29745c883ce981ed72e273f6aac8ccccab503 # print br,$ENV{'PATH'},br; -$ENV{'JTAGPATH'}="/local.1/jtag_mvd/soft/toolbox/jtag_atomic/"; -$ENV{'DAQOPSERVER'}="localhost:7"; +# $ENV{'JTAGPATH'}="/local.1/jtag_mvd/soft/toolbox/jtag_atomic/"; +# $ENV{'DAQOPSERVER'}="localhost:7"; + unless(-e $dumpPath or mkdir $dumpPath) { + die "Unable to create $dumpPath\n"; + } + unless(-e $picPath or mkdir $picPath) { + die "Unable to create $picPath\n"; + } + ++<<<<<<< HEAD +system("./startup.pl ".SETUPFILE); +chdir("preview"); ++======= + system("./startup.pl ../setup/testsetup.xml"); + # chdir("preview"); ++>>>>>>> 23c29745c883ce981ed72e273f6aac8ccccab503 my $dummy;