You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by Chuck Rolke <cr...@redhat.com> on 2013/04/10 16:46:38 UTC
Request for inclusion into 0.22 - cmake-uninstall file not in -cpp
source tarball
I have a patch in QPID-4729 that really ought to go into 0.22 since without it cmake fails.
That said, I'm supplying the patch without actually doing a source tarball construction, a subsequent cmake build that produces the unistalll, an install, and finally an uninstall that proves it works. On Windows I never do a source kit install but just work within a source kit development environment.
Is the cmake uninstall ready for prime time?
-Chuck
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Justin Ross <jr...@apache.org>.
Without this, is the windows build broken, or does it just have
useless files hanging around in the windows distribution?
Justin
On Tue, Apr 23, 2013 at 10:36 AM, Alan Conway <ac...@redhat.com> wrote:
> On 04/18/2013 09:35 AM, Justin Ross wrote:
>>
>> Hey, Alan. It looks like this one was garbled. Were there other
>> things you meant to request?
>>
> Wow, that was garbled! I think this is the only one worth considering:
>
>
> commit 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40
> Author: Alan Conway <ac...@apache.org>
> Commit: Alan Conway <ac...@apache.org>
>
> QPID-4733: Fix windows problem introduced by installation of init
> scripts
>
> Do init script installation conditional on UNIX only.
> SYSCONF_INSTALL_DIR is not set on windows.
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467054
> 13f79535-47bb-0310-9956-ffa450edef68
>
> diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
> index f2dbc85..a8aae0e 100644
> --- a/qpid/cpp/etc/CMakeLists.txt
> +++ b/qpid/cpp/etc/CMakeLists.txt
> @@ -17,18 +17,23 @@
> # under the License.
> #
>
> -# Use automake variable names as these files are also configured by
> automake.
> -set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
> -set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
> -set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
> -
> -configure_file(qpidd.in
> - ${CMAKE_CURRENT_BINARY_DIR}/qpidd
> - @ONLY)
> -
> -configure_file(qpidd-primary.in
> - ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
> - @ONLY)
> +if (UNIX)
> +
> + # Use automake variable names as these files are also configured by
> automake.
> + # Use absolute paths as these are substituted into init scripts.
> + set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
> + set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
> + set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
> +
> + configure_file(qpidd.in
> + ${CMAKE_CURRENT_BINARY_DIR}/qpidd
> + @ONLY)
> +
> + configure_file(qpidd-primary.in
> + ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
> + @ONLY)
> +
> +endif (UNIX)
>
> install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd
> ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
> PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
> GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> For additional commands, e-mail: dev-help@qpid.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Alan Conway <ac...@redhat.com>.
On 04/18/2013 09:35 AM, Justin Ross wrote:
> Hey, Alan. It looks like this one was garbled. Were there other
> things you meant to request?
>
Wow, that was garbled! I think this is the only one worth considering:
commit 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40
Author: Alan Conway <ac...@apache.org>
Commit: Alan Conway <ac...@apache.org>
QPID-4733: Fix windows problem introduced by installation of init scripts
Do init script installation conditional on UNIX only.
SYSCONF_INSTALL_DIR is not set on windows.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467054
13f79535-47bb-0310-9956-ffa450edef68
diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
index f2dbc85..a8aae0e 100644
--- a/qpid/cpp/etc/CMakeLists.txt
+++ b/qpid/cpp/etc/CMakeLists.txt
@@ -17,18 +17,23 @@
# under the License.
#
-# Use automake variable names as these files are also configured by automake.
-set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
-set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
-set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
-
-configure_file(qpidd.in
- ${CMAKE_CURRENT_BINARY_DIR}/qpidd
- @ONLY)
-
-configure_file(qpidd-primary.in
- ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
- @ONLY)
+if (UNIX)
+
+ # Use automake variable names as these files are also configured by automake.
+ # Use absolute paths as these are substituted into init scripts.
+ set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
+ set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
+ set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
+
+ configure_file(qpidd.in
+ ${CMAKE_CURRENT_BINARY_DIR}/qpidd
+ @ONLY)
+
+ configure_file(qpidd-primary.in
+ ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
+ @ONLY)
+
+endif (UNIX)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd
${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Justin Ross <jr...@apache.org>.
Hey, Alan. It looks like this one was garbled. Were there other
things you meant to request?
On Tue, Apr 16, 2013 at 10:35 AM, Alan Conway <ac...@redhat.com> wrote:
> On 04/11/2013 09:45 AM, Chuck Rolke wrote:
>>
>> I think it's across the board but I tried only on Windows. It's only an
>> issue in the -cpp tarball, not on the complete kit which works just fine.
>>
>> I think we ought to go ahead with the inclusion based on, as Steve says,
>> our push to cmake.
>>
>
> I've been fixing cmake problems on trunk since the initial descision was not
> to include them. Do we want to port these?
>
> QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
> and direct children in the configuration file
>
> makes ID generation behaviour consistent with that for objects added via
> the management interface
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
> 13f79535-47bb-0310-9956-ffa450edef68
> commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
> Author: Robert Gemmell <ro...@apache.org>
> Commit: Robert Gemmell <ro...@apache.org>
>
> QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
> and direct children in the configuration file
>
> makes ID generation behaviour consistent with that for objects added via
> the management interface
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
> 13f79535-47bb-0310-9956-ffa450edef68
> commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
> Author: Robert Gemmell <ro...@apache.org>
> Commit: Robert Gemmell <ro...@apache.org>
>
> QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
> and direct children in the configuration file
>
> makes ID generation behaviour consistent with that for objects added via
> the management interface
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
> 13f79535-47bb-0310-9956-ffa450edef68
> commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
> Author: Robert Gemmell <ro...@apache.org>
> Commit: Robert Gemmell <ro...@apache.org>
>
> QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
> and direct children in the configuration file
>
> makes ID generation behaviour consistent with that for objects added via
> the management interface
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
> 13f79535-47bb-0310-9956-ffa450edef68
> commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
> Author: Robert Gemmell <ro...@apache.org>
> Commit: Robert Gemmell <ro...@apache.org>
>
> QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
> and direct children in the configuration file
>
> makes ID generation behaviour consistent with that for objects added via
> the management interface
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
> 13f79535-47bb-0310-9956-ffa450edef68
> commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
> Author: Robert Gemmell <ro...@apache.org>
> Commit: Robert Gemmell <ro...@apache.org>
>
> QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
> and direct children in the configuration file
>
> makes ID generation behaviour consistent with that for objects added via
> the management interface
>
> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
> 13f79535-47bb-0310-9956-ffa450edef68
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> For additional commands, e-mail: dev-help@qpid.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Alan Conway <ac...@redhat.com>.
On 04/11/2013 09:45 AM, Chuck Rolke wrote:
> I think it's across the board but I tried only on Windows. It's only an issue in the -cpp tarball, not on the complete kit which works just fine.
>
> I think we ought to go ahead with the inclusion based on, as Steve says, our push to cmake.
>
I've been fixing cmake problems on trunk since the initial descision was not to
include them. Do we want to port these?
QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and
direct children in the configuration file
makes ID generation behaviour consistent with that for objects added via
the management interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
13f79535-47bb-0310-9956-ffa450edef68
commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
Author: Robert Gemmell <ro...@apache.org>
Commit: Robert Gemmell <ro...@apache.org>
QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and
direct children in the configuration file
makes ID generation behaviour consistent with that for objects added via
the management interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
13f79535-47bb-0310-9956-ffa450edef68
commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
Author: Robert Gemmell <ro...@apache.org>
Commit: Robert Gemmell <ro...@apache.org>
QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and
direct children in the configuration file
makes ID generation behaviour consistent with that for objects added via
the management interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
13f79535-47bb-0310-9956-ffa450edef68
commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
Author: Robert Gemmell <ro...@apache.org>
Commit: Robert Gemmell <ro...@apache.org>
QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and
direct children in the configuration file
makes ID generation behaviour consistent with that for objects added via
the management interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
13f79535-47bb-0310-9956-ffa450edef68
commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
Author: Robert Gemmell <ro...@apache.org>
Commit: Robert Gemmell <ro...@apache.org>
QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and
direct children in the configuration file
makes ID generation behaviour consistent with that for objects added via
the management interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
13f79535-47bb-0310-9956-ffa450edef68
commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
Author: Robert Gemmell <ro...@apache.org>
Commit: Robert Gemmell <ro...@apache.org>
QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and
direct children in the configuration file
makes ID generation behaviour consistent with that for objects added via
the management interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
13f79535-47bb-0310-9956-ffa450edef68
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Gordon Sim <gs...@redhat.com>.
On 04/18/2013 02:32 PM, Justin Ross wrote:
> On Thu, Apr 11, 2013 at 9:45 AM, Chuck Rolke <cr...@redhat.com> wrote:
>> I think we ought to go ahead with the inclusion based on, as Steve says, our push to cmake.
>
> I'm afraid I disagree. That was our goal, but we missed. The absence
> of the uninstall target can't be considered a critical problem.
> Rejected for 0.22.
I think it may be worse than simply the uninstall target not working. It
looks to me like an autotools based source release can't be built with
cmake... of course it may be something specific to me.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Justin Ross <ju...@gmail.com>.
On Thu, Apr 11, 2013 at 9:45 AM, Chuck Rolke <cr...@redhat.com> wrote:
> I think we ought to go ahead with the inclusion based on, as Steve says, our push to cmake.
I'm afraid I disagree. That was our goal, but we missed. The absence
of the uninstall target can't be considered a critical problem.
Rejected for 0.22.
Justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Chuck Rolke <cr...@redhat.com>.
I think it's across the board but I tried only on Windows. It's only an issue in the -cpp tarball, not on the complete kit which works just fine.
I think we ought to go ahead with the inclusion based on, as Steve says, our push to cmake.
-Chuck
----- Original Message -----
> From: "Fraser Adams" <fr...@blueyonder.co.uk>
> To: dev@qpid.apache.org
> Sent: Thursday, April 11, 2013 1:02:18 AM
> Subject: Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball
>
> Is the issue Windows only or across the board? I did a cmake ... make
> all, make install, make unistall on Ubuntu off trunk a week or so back
> and I ended up with the cleanest make process I've ever had on Ubuntu,
> so despite my initial scepticism about cmake I was quite pleased.
>
> I personally quite like having the ability to do "make uninstall" as
> it's intuitive
>
> however
>
> 'sudo xargs rm < install_manifest.txt'
>
> works for me too so, if it's a blocker to anyone by leaving the
> uninstall target in I can live without it. Though just to flag up that
> everytime I've upgraded Qpid (I install to /usr/local) I've found things
> more reliable if I do a full uninstall first. That *may* have been an
> issue with automake getting confused between libraries "higher up" ld's
> search path and perhaps it's not something that happens with cmake.
>
> I'll defer to the consensus, it won't kill me either way, but thought it
> was worth mentioning.
>
> Frase
>
>
> On 10/04/13 22:14, Steve Huston wrote:
> > No, I do not plan to use the cmake uninstall feature.
> >
> >> -----Original Message-----
> >> From: Justin Ross [mailto:justin.ross@gmail.com]
> >> Sent: Wednesday, April 10, 2013 4:38 PM
> >> To: dev@qpid.apache.org
> >> Subject: Re: Request for inclusion into 0.22 - cmake-uninstall file not in
> >> -cpp
> >> source tarball
> >>
> >> Steve, do you plan to use the uninstall facility? That went in after
> >> Beta, and
> >> subsequently had a couple problems. I'm inclined to instead revert the
> >> uninstall change, which should also return the cmake build to working.
> >>
> >> Justin
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org For additional
> >> commands, e-mail: dev-help@qpid.apache.org
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> > For additional commands, e-mail: dev-help@qpid.apache.org
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> For additional commands, e-mail: dev-help@qpid.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Fraser Adams <fr...@blueyonder.co.uk>.
Is the issue Windows only or across the board? I did a cmake ... make
all, make install, make unistall on Ubuntu off trunk a week or so back
and I ended up with the cleanest make process I've ever had on Ubuntu,
so despite my initial scepticism about cmake I was quite pleased.
I personally quite like having the ability to do "make uninstall" as
it's intuitive
however
'sudo xargs rm < install_manifest.txt'
works for me too so, if it's a blocker to anyone by leaving the
uninstall target in I can live without it. Though just to flag up that
everytime I've upgraded Qpid (I install to /usr/local) I've found things
more reliable if I do a full uninstall first. That *may* have been an
issue with automake getting confused between libraries "higher up" ld's
search path and perhaps it's not something that happens with cmake.
I'll defer to the consensus, it won't kill me either way, but thought it
was worth mentioning.
Frase
On 10/04/13 22:14, Steve Huston wrote:
> No, I do not plan to use the cmake uninstall feature.
>
>> -----Original Message-----
>> From: Justin Ross [mailto:justin.ross@gmail.com]
>> Sent: Wednesday, April 10, 2013 4:38 PM
>> To: dev@qpid.apache.org
>> Subject: Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp
>> source tarball
>>
>> Steve, do you plan to use the uninstall facility? That went in after Beta, and
>> subsequently had a couple problems. I'm inclined to instead revert the
>> uninstall change, which should also return the cmake build to working.
>>
>> Justin
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org For additional
>> commands, e-mail: dev-help@qpid.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> For additional commands, e-mail: dev-help@qpid.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
RE: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Steve Huston <sh...@riverace.com>.
No, I do not plan to use the cmake uninstall feature.
> -----Original Message-----
> From: Justin Ross [mailto:justin.ross@gmail.com]
> Sent: Wednesday, April 10, 2013 4:38 PM
> To: dev@qpid.apache.org
> Subject: Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp
> source tarball
>
> Steve, do you plan to use the uninstall facility? That went in after Beta, and
> subsequently had a couple problems. I'm inclined to instead revert the
> uninstall change, which should also return the cmake build to working.
>
> Justin
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org For additional
> commands, e-mail: dev-help@qpid.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Justin Ross <ju...@gmail.com>.
Steve, do you plan to use the uninstall facility? That went in after
Beta, and subsequently had a couple problems. I'm inclined to instead
revert the uninstall change, which should also return the cmake build
to working.
Justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: Request for inclusion into 0.22 - cmake-uninstall file not in
-cpp source tarball
Posted by Steve Huston <sh...@riverace.com>.
Since we are encouraging cmake builds I think this should be fixed for the relas.
Steve Huston
(sent from my iPhone - please excuse brevity and typos)
On Apr 10, 2013, at 10:47 AM, "Chuck Rolke" <cr...@redhat.com> wrote:
> I have a patch in QPID-4729 that really ought to go into 0.22 since without it cmake fails.
>
> That said, I'm supplying the patch without actually doing a source tarball construction, a subsequent cmake build that produces the unistalll, an install, and finally an uninstall that proves it works. On Windows I never do a source kit install but just work within a source kit development environment.
>
> Is the cmake uninstall ready for prime time?
>
> -Chuck
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> For additional commands, e-mail: dev-help@qpid.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org