Skip to content
Snippets Groups Projects

Caqtdm check, warning cleanup

Merged Ezekiel Dohmen requested to merge ezekiel.dohmen/advligorts:caqtdm-check into master
2 files
+ 23
12
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 22
11
@@ -1930,7 +1930,6 @@ close OUT;
close OUTD;
close WARNINGS;
#// Write out the User Space Code Here (Just copy it, same code file for both)
copy("./".$modelCodeKernFilepath, "./".$modelCodeUspFilepath) or die "copy failed: $! : ";
@@ -2313,17 +2312,29 @@ for($ii=0;$ii<$dacCnt;$ii++)
# ******************************************************************************************
#// - GENERATE caQtDM SCREENS
opendir my $dh, $epicsScreensDir;
while (my $cf = readdir $dh) {
if($cf =~ m/.adl/) {
my ($fbase,$fext) = split '\.',$cf;
system("cp $epicsScreensDir/$cf ." );
$ui_output = "$caqtdmScreensDir/$fbase" . ".ui";
system("adl2ui $cf");
system("cp $fbase.ui $ui_output");
system("rm $fbase.ui $cf");
}
if ( system("adl2ui -h") == 0 )
{
opendir my $dh, $epicsScreensDir;
while (my $cf = readdir $dh) {
if($cf =~ m/.adl/) {
my ($fbase,$fext) = split '\.',$cf;
system("cp $epicsScreensDir/$cf ." );
$ui_output = "$caqtdmScreensDir/$fbase" . ".ui";
system("adl2ui $cf");
system("cp $fbase.ui $ui_output");
system("rm $fbase.ui $cf");
}
}
}
else #No caQtDM installed skip
{
print WARNINGS "\ncaqtdm is not installed, skipping caQtDM screen generation.\n\n";
}
close WARNINGS;
#// - Print source file names into a file
#
Loading