epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

RTEMS: Added parentheses around command arguments for CEXP.

Browse Source 
In particular the generated cdCommands file, and the lines in
the st.cmd@RTEMS file template.
This commit is contained in:
Andrew Johnson
2010-10-05 16:02:09 -05:00
parent 641aa70eb1
commit d4bf5ec2d7
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/makeBaseApp/top/iocBoot/ioc/st.cmd@RTEMS
+5 -5
View File
@@ -6,14 +6,14 @@
#< envPaths
## Register all support components
dbLoadDatabase "dbd/_APPNAME_.dbd"
_CSAFEAPPNAME__registerRecordDeviceDriver pdbbase
dbLoadDatabase("dbd/_APPNAME_.dbd")
_CSAFEAPPNAME__registerRecordDeviceDriver(pdbbase)
## Load record instances
#dbLoadTemplate "db/_APPNAME_.substitutions"
#dbLoadRecords "db/_APPNAME_.db", "user=_USER_"
#dbLoadTemplate("db/_APPNAME_.substitutions")
#dbLoadRecords("db/_APPNAME_.db", "user=_USER_")
iocInit
## Start any sequence programs
#seq sncxxx, "user=_USER_"
#seq(sncxxx, "user=_USER_")
src/tools/convertRelease.pl
+12 -7
View File
@@ -132,7 +132,8 @@ sub binDirs {
}
#
# Generate cdCommands file with cd path strings for vxWorks IOCs
# Generate cdCommands file with cd path strings for vxWorks IOCs and
# RTEMS IOCs using CEXP (need parentheses around command arguments).
#
sub cdCommands {
die "Architecture not set (use -a option)" unless ($arch);
@@ -149,22 +150,26 @@ sub cdCommands {
my $ioc = $cwd;
$ioc =~ s/^.*\///; # iocname is last component of directory name
print OUT "putenv \"ARCH=$arch\"\n";
print OUT "putenv \"IOC=$ioc\"\n";
print OUT "putenv(\"ARCH=$arch\")\n";
print OUT "putenv(\"IOC=$ioc\")\n";
foreach my $app (@includes) {
my $iocpath = my $path = $macros{$app};
$iocpath =~ s/^$root/$iocroot/o if ($opt_t);
my $app_lc = lc($app);
print OUT "$app_lc = \"$iocpath\"\n" if (-d $path);
print OUT "putenv \"$app=$iocpath\"\n" if (-d $path);
print OUT "${app_lc}bin = \"$iocpath/bin/$arch\"\n" if (-d "$path/bin/$arch");
print OUT "$app_lc = \"$iocpath\"\n"
if (-d $path);
print OUT "putenv(\"$app=$iocpath\")\n"
if (-d $path);
print OUT "${app_lc}bin = \"$iocpath/bin/$arch\"\n"
if (-d "$path/bin/$arch");
}
close OUT;
}
#
# Generate envPaths file with epicsEnvSet commands for other IOCs
# Generate envPaths file with epicsEnvSet commands for iocsh IOCs.
# Include parentheses anyway in case CEXP users want to use this.
#
sub envPaths {
die "Architecture not set (use -a option)" unless ($arch);