Author: fast Date: 2012-03-13 14:17:32 -0700 (Tue, 13 Mar 2012) New Revision: 197 - (https://trac.ict.usc.edu/vh_public/changeset/197) Log: activemq - merging changes from VH repository r11236, r11241, r11248, r11249
r11236 apr - copying libs to another folder to retain vs2008 (vc9) versions r11241 apr - merging changes from vs2010 branch. r11156 r11248 activemq-cpp - copying folder to create vs2010 version r11249 activemq-cpp - recompiled for VS2010. Did the same thing as r11162, except put the files in vs2010-build. that's why I didn't merge it. Commit comments from r11162: branch - activemq-cpp - recompiled for VS2010. Only changes had to make were: - \src\main\activemq\util\Config.h - \src\main\decaf\util\Config.h Commented out #define _SECURE_SCL 1 (we let the compiler use the default behavior). This was causing conflicts with other statically linked libs. Not convinced that the Debug64 versions are working correctly. Added: trunk/lib/activemq/activemq-cpp/vs2010-build/ trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL/ trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL/activemq-cppd.dll trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL/activemq-cppd.lib trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL/activemq-cppd.pdb trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL64/ trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL64/activemq-cppd.dll trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL64/activemq-cppd.lib trunk/lib/activemq/activemq-cpp/vs2010-build/DebugDLL64/activemq-cppd.pdb trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL/ trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL/activemq-cpp.dll trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL/activemq-cpp.lib trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL/activemq-cpp.pdb trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL64/ trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL64/activemq-cpp.dll trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL64/activemq-cpp.lib trunk/lib/activemq/activemq-cpp/vs2010-build/ReleaseDLL64/activemq-cpp.pdb trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj.filters trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj.filters trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-producer.vcxproj trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-unittests.vcxproj trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp-unittests.vcxproj.filters trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp.sln trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp.vcxproj trunk/lib/activemq/activemq-cpp/vs2010-build/activemq-cpp.vcxproj.filters trunk/lib/activemq/apr/apr-iconv/lib9-64/ trunk/lib/activemq/apr/apr-iconv/lib9-64/libapriconv-1.dll trunk/lib/activemq/apr/apr-iconv/lib9-64/libapriconv-1.lib trunk/lib/activemq/apr/apr-iconv/lib9-64/libapriconv-1.pdb trunk/lib/activemq/apr/apr-iconv/lib9/ trunk/lib/activemq/apr/apr-iconv/lib9/Makefile.in trunk/lib/activemq/apr/apr-iconv/lib9/api_version.c trunk/lib/activemq/apr/apr-iconv/lib9/charset_alias.h trunk/lib/activemq/apr/apr-iconv/lib9/iconv.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv.h trunk/lib/activemq/apr/apr-iconv/lib9/iconv_ccs.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv_ces.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv_ces_euc.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv_ces_iso2022.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv_int.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv_module.c trunk/lib/activemq/apr/apr-iconv/lib9/iconv_uc.c trunk/lib/activemq/apr/apr-iconv/lib9/libapriconv-1.dll trunk/lib/activemq/apr/apr-iconv/lib9/libapriconv-1.lib trunk/lib/activemq/apr/apr-iconv/lib9/libapriconv-1.pdb trunk/lib/activemq/apr/apr-util/lib9-64/ trunk/lib/activemq/apr/apr-util/lib9-64/libaprutil-1.dll trunk/lib/activemq/apr/apr-util/lib9-64/libaprutil-1.lib trunk/lib/activemq/apr/apr-util/lib9-64/libaprutil-1.pdb trunk/lib/activemq/apr/apr-util/lib9/ trunk/lib/activemq/apr/apr-util/lib9/libaprutil-1.dll trunk/lib/activemq/apr/apr-util/lib9/libaprutil-1.lib trunk/lib/activemq/apr/apr-util/lib9/libaprutil-1.pdb trunk/lib/activemq/apr/apr/lib9-64/ trunk/lib/activemq/apr/apr/lib9-64/libapr-1.dll trunk/lib/activemq/apr/apr/lib9-64/libapr-1.lib trunk/lib/activemq/apr/apr/lib9-64/libapr-1.pdb trunk/lib/activemq/apr/apr/lib9/ trunk/lib/activemq/apr/apr/lib9/libapr-1.dll trunk/lib/activemq/apr/apr/lib9/libapr-1.lib trunk/lib/activemq/apr/apr/lib9/libapr-1.pdb Modified: trunk/lib/activemq/apr/apr-iconv/lib/libapriconv-1.dll trunk/lib/activemq/apr/apr-iconv/lib/libapriconv-1.lib trunk/lib/activemq/apr/apr-iconv/lib/libapriconv-1.pdb trunk/lib/activemq/apr/apr-iconv/lib64/libapriconv-1.dll trunk/lib/activemq/apr/apr-iconv/lib64/libapriconv-1.lib trunk/lib/activemq/apr/apr-iconv/lib64/libapriconv-1.pdb trunk/lib/activemq/apr/apr-util/lib/libaprutil-1.dll trunk/lib/activemq/apr/apr-util/lib/libaprutil-1.lib trunk/lib/activemq/apr/apr-util/lib/libaprutil-1.pdb trunk/lib/activemq/apr/apr-util/lib64/libaprutil-1.dll trunk/lib/activemq/apr/apr-util/lib64/libaprutil-1.lib trunk/lib/activemq/apr/apr-util/lib64/libaprutil-1.pdb trunk/lib/activemq/apr/apr/lib/libapr-1.dll trunk/lib/activemq/apr/apr/lib/libapr-1.lib trunk/lib/activemq/apr/apr/lib/libapr-1.pdb trunk/lib/activemq/apr/apr/lib64/libapr-1.dll trunk/lib/activemq/apr/apr/lib64/libapr-1.lib trunk/lib/activemq/apr/apr/lib64/libapr-1.pdb ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Smartbody-svn mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/smartbody-svn
