Experimental Physics and
Industrial Control System

Andrew Johnson <[email protected]> · Fri, 15 Dec 2017 10:55:54 -0600

Hi Mark,

Oops, my bad, 7.0.2 it will have to be then since I already pushed the
tag. Luckily this only affects the core module, the sub-module versions
don't have to be changed.

- Andrew

On 12/15/2017 09:09 AM, Mark Rivers wrote:
> Hi Andrew,
> 
> 
> I just updated my repository to 7.0.1.  It appears to me that the changes we discussed to src/tools/EPICS/Release.pm are not in 7.0.1?  I think this means that builds will fail for synApps in the quadEM, dxp, and xxx modules because a RELEASE file is called twice, but not recursively?
> 
> 
> diff --git a/src/tools/EPICS/Release.pm b/src/tools/EPICS/Release.pm
> index bceed2e..2b9cc1f 100644
> --- a/src/tools/EPICS/Release.pm
> +++ b/src/tools/EPICS/Release.pm
> @@ -46,7 +46,7 @@ sub readRelease {
>      my ($file, $Rmacros, $Rapps, $Rdone) = @_;
>      # $Rmacros and $Rdone are hash-refs, $Rapps an array-ref
> 
> -    if (exists $Rdone->{$file}) {
> +    if ($Rdone->{$file} > 0) {
>          die "Release.pm: Recursive loop found in RELEASE files,\n" .
>              "discovered in $file\n";
>      }
> @@ -83,6 +83,7 @@ sub readRelease {
>          }
>      }
>      close $IN;
> +    $Rdone->{$file}--;
>  }
> 
>  #
> 
> 
> Thanks,
> 
> Mark
> 
> 
> 
> 
> 
> ________________________________
> From: [email protected] <[email protected]> on behalf of Andrew Johnson <[email protected]>
> Sent: Thursday, December 14, 2017 7:19 PM
> To: EPICS core-talk
> Subject: 7.0.1 Final
> 
> I've tagged and pushed everything, but haven't created the tarfile or
> done anything else, that'll have to wait until tomorrow (but Ralph can
> grab the tagged versions for ITER):
> 
>> tux% git submodule status
>>  524ceee2c8ce8f8446c46d93b5a467edd14b8cc5 modules/ca (ca-4.13.1)
>>  610f008529059c7fc1e35896ff0f678b7adcfa6d modules/database (database-3.17.0)
>>  8ce980f6637d85fb1f5a139bab404269734b31bc modules/libcom (libcom-3.17.0)
>>  ba2e1c8a1d1837c8817e14372cccc12f16942200 modules/normativeTypes (5.2.0)
>>  8c4353bd57dc4e29145792b2b6e2aeeb81c32efe modules/pvAccess (6.0.0)
>>  07afe3887bc4d6ca921d135eef13d91c9e84a155 modules/pvData (7.0.0)
>>  b26c0ecd713a9c87b891afbfef44d6109e13800a modules/pvDatabase (4.3.0)
>>  40014786810c3709c0e14cb179c93cdcfb66f973 modules/pva2pva (1.0.0)
>>  b5291d96196825fd2ce5d7ce47559b1dddf3449e modules/pvaClient (4.3.0)
> 
> It's 7:20pm and I'm going home.
> 
> - Andrew
> 
> --
> Arguing for surveillance because you have nothing to hide is no
> different than making the claim, "I don't care about freedom of
> speech because I have nothing to say." -- Edward Snowdon
> 

-- 
Arguing for surveillance because you have nothing to hide is no
different than making the claim, "I don't care about freedom of
speech because I have nothing to say." -- Edward Snowdon

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System