activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r617696 - in /activemq/activemq-cpp/decaf/trunk: src/test/decaf/lang/SystemTest.cpp vs2005-build/vs2005-decaf-unittests.vcproj vs2005-build/vs2005-decaf.vcproj
Date Fri, 01 Feb 2008 23:06:48 GMT
Author: tabish
Date: Fri Feb  1 15:06:40 2008
New Revision: 617696

URL: http://svn.apache.org/viewvc?rev=617696&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Working on the Windows Build

Modified:
    activemq/activemq-cpp/decaf/trunk/src/test/decaf/lang/SystemTest.cpp
    activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj
    activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj

Modified: activemq/activemq-cpp/decaf/trunk/src/test/decaf/lang/SystemTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/test/decaf/lang/SystemTest.cpp?rev=617696&r1=617695&r2=617696&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/test/decaf/lang/SystemTest.cpp (original)
+++ activemq/activemq-cpp/decaf/trunk/src/test/decaf/lang/SystemTest.cpp Fri Feb  1 15:06:40
2008
@@ -47,7 +47,7 @@
     Map<std::string, std::string> values = System::getenv();
 
     CPPUNIT_ASSERT( values.size() != 0 );
-    CPPUNIT_ASSERT( values.containsKey( "PATH" ) );
+    CPPUNIT_ASSERT( values.containsKey( "PATH" ) || values.containsKey( "Path" ) );
     CPPUNIT_ASSERT( !values.containsKey( "PATH_ASDFGHJKL" ) );
 }
 

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj?rev=617696&r1=617695&r2=617696&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj Fri Feb 
1 15:06:40 2008
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -151,10 +151,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
+				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program
Files\APR\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -216,7 +216,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DECAF_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -303,7 +303,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -312,7 +312,7 @@
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
+				WarningLevel="0"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4290, 4101"

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj?rev=617696&r1=617695&r2=617696&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj Fri Feb  1 15:06:40
2008
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\main;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;$(NOINHERIT)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -181,7 +181,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\main;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;DECAF_DLL;DECAF_EXPORTS;$(NOINHERIT)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -204,8 +204,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\decaf.dll"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;"
 				GenerateDebugInformation="true"
 			/>
 			<Tool
@@ -260,7 +261,7 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\main;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;DECAF_DLL;DECAF_EXPORTS;$(NOINHERIT)"
 				KeepComments="false"
 				MinimalRebuild="false"
@@ -271,7 +272,7 @@
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
+				WarningLevel="2"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4290;4101;4251"
@@ -287,8 +288,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+				AdditionalDependencies="libapr-1.lib libaprutil-1.lib ws2_32.lib"
 				OutputFile="$(OutDir)\decafd.dll"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;"
 				GenerateDebugInformation="true"
 			/>
 			<Tool



Mime
View raw message