Experimental Physics and
Industrial Control System

Mark Rivers <[email protected]> · Mon, 19 Sep 2016 02:42:25 +0000

The errors I reported in my previous message are due to problems with parallel make with dynamic builds in mingw in 3.14.12.5.  They don't occur in 3.15.4.  If I remove the -j flag it builds OK.

However, I need to know how to checkout the version of each submodule that corresponds to the 4.6.0 top-level version.

Based on what I think Ralph was suggesting this evening I tried the following:

CHECK OUT AN OLD VERSION OF PVDATA
corvette:epics/epicsV4/bundleCPP>cd pvDataCPP/
/usr/local/epics/epicsV4/bundleCPP/pvDataCPP
corvette:epicsV4/bundleCPP/pvDataCPP>git checkout 3.0.0
Note: checking out '3.0.0'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 5f8fa26... jenkins: Fix CloudBees hgweb job

corvette:epicsV4/bundleCPP/pvDataCPP>git diff 3.0.0

NOW CHECK OUT 4.6.0 OF THE TOP-LEVEL REPOSITORY

corvette:epicsV4/bundleCPP/pvDataCPP>cd ..
/usr/local/epics/epicsV4/bundleCPP
corvette:epics/epicsV4/bundleCPP>git checkout 4.6.0
M       exampleCPP
M       normativeTypesCPP
M       pvAccessCPP
M       pvCommonCPP
M       pvDataCPP
M       pvDatabaseCPP
M       pvaClientCPP
M       pvaSrv
HEAD is now at f9ba7a1... Update release-notes for 4.6.0 final
corvette:epics/epicsV4/bundleCPP>cd pvDataCPP/
/usr/local/epics/epicsV4/bundleCPP/pvDataCPP

GO BACK INTO PVDATA.  IT IS STILL 3.0.0, IT HAS NOT BEEN UPDATED.

corvette:epicsV4/bundleCPP/pvDataCPP>git diff 3.0.0
corvette:epicsV4/bundleCPP/pvDataCPP>

What command do I issue in the top-level repository to ensure that all submodules are at the correct version for 4.6.0 of the top-level?

Thanks,
Mark

________________________________________
From: Mark Rivers
Sent: Sunday, September 18, 2016 2:58 PM
To: Johnson, Andrew N.p
Cc: EPICS core-talk
Subject: RE: Errors when running "make -sj clean" on windows-x64 in top-level of pvPackageCPP

I tried giving the branch in the git clone command:

git clone --recursive --branch 4.6.0 [email protected]:epics-base/bundleCPP.git

That did not work, I still get an older version of pvDataCPP that gives the errors on mingw about inline function.

I then did "git checkout master" in pvDataCPP.  That worked better but it eventually failed with this error:

./../testApp/pv/testPVType.cpp:63:44: warning: too many arguments for format
testEvent.o:testEvent.cpp:(.text+0xf): undefined reference to `__imp___ZN16MutexInitializerD1Ev'
testEvent.o:testEvent.cpp:(.text+0x8d): undefined reference to `__imp___ZN5epics6pvData5EventC1Eb'
testEvent.o:testEvent.cpp:(.text+0xa2): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0xce): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0xfa): undefined reference to `__imp___ZN5epics6pvData5Event6signalEv'
testEvent.o:testEvent.cpp:(.text+0x107): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x130): undefined reference to `__imp___ZN5epics6pvData5Event6signalEv'
testEvent.o:testEvent.cpp:(.text+0x13d): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x166): undefined reference to `__imp___ZN5epics6pvData5Event6signalEv'
testEvent.o:testEvent.cpp:(.text+0x173): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x19c): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x1c8): undefined reference to `__imp___ZN5epics6pvData5Event6signalEv'
testEvent.o:testEvent.cpp:(.text+0x1d5): undefined reference to `__imp___ZN5epics6pvData5Event6signalEv'
testEvent.o:testEvent.cpp:(.text+0x1e2): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x20b): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x237): undefined reference to `__imp___ZN5epics6pvData5Event7tryWaitEv'
testEvent.o:testEvent.cpp:(.text+0x26b): undefined reference to `__imp___ZN5epics6pvData5EventD1Ev'
testEvent.o:testEvent.cpp:(.text+0x2a4): undefined reference to `__imp___ZN5epics6pvData5EventD1Ev'
testEvent.o:testEvent.cpp:(.text+0x2cf): undefined reference to `__imp___ZN16MutexInitializerC1Ev'
collect2: ld returned 1 exit status
make[3]: *** [testEvent.exe] Error 1
make[3]: *** Waiting for unfinished jobs....
make[3]: *** wait: No child processes.  Stop.
make[2]: *** [install.win32-x86-mingw] Error 2
make[2]: *** Waiting for unfinished jobs....
mkdir ../../bin/vxWorks-ppc32
make[1]: *** [testApp.install] Error 2
make: *** [build.pvDataCPP] Error 2

There may also be a problem with distclean and parallel make:

corvette:epics/epicsV4/bundleCPP>make -sj distclean
EPICS/Release.pm: Undefined macro $(EPICS_BASE) used
EPICS/Release.pm: Undefined macro $(EPICS_BASE) used
EPICS/Release.pm: Undefined macro $(EPICS_BASE) used
EPICS/Release.pm: Undefined macro $(EPICS_BASE) used

Thanks,
Mark

________________________________________
From: Mark Rivers
Sent: Sunday, September 18, 2016 1:57 PM
To: Johnson, Andrew N.
Cc: EPICS core-talk
Subject: RE: Errors when running "make -sj clean" on windows-x64 in top-level of pvPackageCPP

Hi Andrew,

I did the following:

git clone --recursive [email protected]:epics-base/bundleCPP.git
cd bundleCPP/
git checkout 4.6.0

However, "git checkout 4.6.0" did not seem to do anything in the submodules.  When I go to a submodule like pvData I see the following:

corvette:epicsV4/bundleCPP/pvDataCPP>git status
# Not currently on any branch.
nothing to commit (working directory clean)
corvette:epicsV4/bundleCPP/pvDataCPP>git tag
1.0-BETA
1.0.1-BETA
1.1-BETA
1.1-SNAPSHOT
2.0-BETA
3.0-pre1
3.0.0
3.0.1
3.0.2
3.1.0
4.0.0
4.0.1
4.0.2
4.0.3
5.0.0
5.0.1
5.0.2
5.0.3
5.0.4
6.0.0
6.0.1
before_merge_changesAfter3_0_2
marchtest
test1

How do I know that this is really version of pvData that corresponds to 4.6.0?

Thanks,
Mark

________________________________________
From: Johnson, Andrew N. [[email protected]]
Sent: Sunday, September 18, 2016 12:41 PM
To: Mark Rivers
Cc: EPICS core-talk
Subject: Re: Errors when running "make -sj clean" on windows-x64 in top-level of pvPackageCPP

Hi Mark,

On Sep 8, 2016, at 10:28 AM, Mark Rivers <[email protected]> wrote:
>
> I get the following errors when running  "make -sj clean" on windows-x64 in top-level of pvPackageCPP

My pvPackageCPP module has been superseded by the bundleCPP module at [email protected]:epics-base/bundleCPP.git which handles parallel builds much better, but is really designed for creating the full C++ release. The release/4.6.0 branch of that module now points to the V4 modules as at the 4.6.0 release which is being made today. The master branch of that module does *not* have the latest versions of the submodules, so make sure you use the right branch.

> I would also really like to be able to do “make realclean” and “make realuninstall” in that top-level directory, but that is not supported.

The bundleCPP module does support ‘make distclean’ although I’m not too sure about doing that in parallel.

- Andrew

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System