You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2010/02/17 01:33:41 UTC
svn commit: r910788 - /qpid/trunk/qpid/cpp/CMakeLists.txt
Author: shuston
Date: Wed Feb 17 00:33:40 2010
New Revision: 910788
URL: http://svn.apache.org/viewvc?rev=910788&view=rev
Log:
Comment out the gacutil stuff for the WCF DLLs and explain why. Related to QPID-2310.
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=910788&r1=910787&r2=910788&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Wed Feb 17 00:33:40 2010
@@ -56,14 +56,23 @@
COMPONENT ${QPID_COMPONENT_EXAMPLES}
PATTERN ".svn" EXCLUDE)
-set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
- ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Channel.dll\\\"'
- ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Interop.dll\\\"'
- ")
-set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
- ExecWait 'gacutil /u \\\"Apache.Qpid.Channel\\\"'
- ExecWait 'gacutil /u \\\"Apache.Qpid.Interop\\\"'
- ")
+ # Find where gacutil is; it's not usually on the default PATH. If it can't
+ # be located, the WCF assemblies can't be inserted in the GAC.
+ # The gacutil stuff is disabled for now; to re-enable it, one must be able
+ # to either find the gacutil somehow and specify the directory where
+ # gacutil lives, add it to PATH, or use the FUSE API in a program that
+ # inserts the DLLs programatically without gacutil. Or use WiX, which can
+ # supposedly do this in an easier way.
+ #
+ # See jira QPID-2310 for more info; update that if you change this.
+ #set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+ # ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Channel.dll\\\"'
+ # ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Interop.dll\\\"'
+ # ")
+ #set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+ # ExecWait 'gacutil /u \\\"Apache.Qpid.Channel\\\"'
+ # ExecWait 'gacutil /u \\\"Apache.Qpid.Interop\\\"'
+ # ")
endif (WIN32)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org