merge r142-r145;

git-svn-id: http://frl.googlecode.com/svn/trunk@146 daf5c975-553e-0410-8cda-3135a9dfd8f3
gmist · Dec 1, 2008 · 42eb526 · 42eb526
1 parent 7281f87
commit 42eb526
Show file tree

Hide file tree

Showing 43 changed files with 1,029 additions and 170 deletions.
diff --git a/build_tools/mvs9/projects/opc/psoi2/psoi2.vcproj b/build_tools/mvs9/projects/opc/psoi2/psoi2.vcproj
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../../include;$(SolutionDir)../../projects/opc/psoi2/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)../../include&quot;;&quot;$(SolutionDir)../../projects/opc/psoi2/include&quot;;&quot;$(SolutionDir)../../projects/opc/psoi2/resource&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -63,10 +63,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -119,8 +120,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../../include;$(SolutionDir)../../projects/opc/psoi2/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)../../include&quot;;&quot;$(SolutionDir)../../projects/opc/psoi2/include&quot;;&quot;$(SolutionDir)../../projects/opc/psoi2/resource&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -138,9 +139,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
@@ -179,10 +181,26 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\channel_desc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\global_var.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\main.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\main_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\prop_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\psoi2_device.cpp"
 				>
@@ -191,12 +209,32 @@
 				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\psoi2_device_manager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\src\util.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="include"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\channel_desc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\global_var.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\main_func.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\prop_func.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\psoi2_device.h"
 				>
@@ -205,12 +243,32 @@
 				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\psoi2_device_manager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\resource\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\include\util.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="resources"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\resource\icons\102.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\resource\resource.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\projects\opc\psoi2\resource\bitmaps\tree_img_list.bmp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

diff --git a/build_tools/mxx_ru/debug/frl.lib.debug.rb b/build_tools/mxx_ru/debug/frl.lib.debug.rb
@@ -28,7 +28,6 @@
 		lib("libboost_thread-mgw34-mt-sd")
 		lib("libboost_filesystem-mgw34-mt-sd")
 		lib("libboost_system-mgw34-mt-sd")
-		lib("libboost_unit_test_framework-mgw34-mt-sd")
 	else
 		# Visual C++ compiler supports auto-linking
 	end

diff --git a/build_tools/mxx_ru/debug/frl.projects.psoi2.debug.rb b/build_tools/mxx_ru/debug/frl.projects.psoi2.debug.rb
@@ -1,16 +1,24 @@
 require 'mxx_ru/cpp'
-require 'ftools' 
+require 'ftools'
 
 MxxRu::Cpp::exe_target("frl.project.psoi2.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
 	target("opc_psoi2_d")
+	screen_mode( MxxRu::Cpp::SCREEN_WINDOW )
 	include_path("../../../projects/opc/psoi2/include")
+	include_path("../../../projects/opc/psoi2/resource")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )
 	rtl_mode( MxxRu::Cpp::RTL_STATIC )
 	threading_mode( MxxRu::Cpp::THREADING_MULTI )
 	obj_placement( MxxRu::Cpp::CustomSubdirObjPlacement.new( "../../../output/projects/opc/psoi2",\
 	"../../../output/projects/opc/psoi2/obj/#{mxx_runtime_mode}/1/2/3" ) )
+	sources_root("../../../projects/opc/psoi2")
 	cpp_sources Dir.glob( "../../../projects/opc/psoi2/src/**/*.cpp" )
+	mswin_rc_file("resource/resource.rc",
+						[ "../../../projects/opc/psoi2/resource/bitmaps/tree_img_list.bmp",
+						"../../../projects/opc/psoi2/resource/icons/102.ico" ] )
+	lib( "comctl32" )
+	lib( "Gdi32" )
 }
 File.copy '../../../projects/opc/psoi2/config.xml', '../../../output/projects/opc/psoi2/config.xml'
diff --git a/build_tools/mxx_ru/debug/frl.test.fs_fn.debug.rb b/build_tools/mxx_ru/debug/frl.test.fs_fn.debug.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.fs_fn.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_fs_fn_d")
 	include_path("../../../test/fs_fn")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.lexical_cast.debug.rb b/build_tools/mxx_ru/debug/frl.test.lexical_cast.debug.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.lexical_cast.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_lexical_cast_d")
 	include_path("../../../test/lexical_cast")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.logging.debug.rb b/build_tools/mxx_ru/debug/frl.test.logging.debug.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.logging.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_logging_d")
 	include_path("../../../test/logging")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.master_test.debug.rb b/build_tools/mxx_ru/debug/frl.test.master_test.debug.rb
@@ -1,9 +1,12 @@
 require 'mxx_ru/cpp'
 require 'ftools'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.master_test.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_master_test_d")
 	include_path("../../../test/master_test")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.opc_address_space.debug.rb b/build_tools/mxx_ru/debug/frl.test.opc_address_space.debug.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.opc_address_space.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_opc_address_space_d")
 	include_path("../../../test/opc_address_space")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.os_win32_registry.debug.rb b/build_tools/mxx_ru/debug/frl.test.os_win32_registry.debug.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.os_win32_registry.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_os_win32_registry_d")
 	include_path("../../../test/os_win32_registry")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.poor_xml.debug.rb b/build_tools/mxx_ru/debug/frl.test.poor_xml.debug.rb
@@ -1,9 +1,12 @@
 require 'mxx_ru/cpp'
 require 'ftools'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.poor_xml.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_poor_xml_d")
 	include_path("../../../test/poor_xml")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/debug/frl.test.smart_ptr.debug.rb b/build_tools/mxx_ru/debug/frl.test.smart_ptr.debug.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.smart_ptr.debug.rb")\
 {
 	required_prj( "frl.lib.debug.rb" )
+	test_setup()
+
 	target("test_smart_ptr_d")
 	include_path("../../../test/smart_ptr")
 	runtime_mode( MxxRu::Cpp::RUNTIME_DEBUG )

diff --git a/build_tools/mxx_ru/release/frl.lib.release.rb b/build_tools/mxx_ru/release/frl.lib.release.rb
@@ -28,7 +28,6 @@
 		lib("libboost_thread-mgw34-mt-s")
 		lib("libboost_filesystem-mgw34-mt-s")
 		lib("libboost_system-mgw34-mt-s")
-		lib("libboost_unit_test_framework-mgw34-mt-s") 
 	else
 		# Visual C++ compiler supports auto-linking
 	end

diff --git a/build_tools/mxx_ru/release/frl.projects.psoi2.release.rb b/build_tools/mxx_ru/release/frl.projects.psoi2.release.rb
@@ -5,12 +5,20 @@
 {
 	required_prj( "frl.lib.release.rb" )
 	target("opc_psoi2")
+	screen_mode( MxxRu::Cpp::SCREEN_WINDOW )
 	include_path("../../../projects/opc/psoi2/include")
+	include_path("../../../projects/opc/psoi2/resource")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )
 	rtl_mode( MxxRu::Cpp::RTL_STATIC )
 	threading_mode( MxxRu::Cpp::THREADING_MULTI )
 	obj_placement( MxxRu::Cpp::CustomSubdirObjPlacement.new( "../../../output/projects/opc/psoi2",\
 	"../../../output/projects/opc/psoi2/obj/#{mxx_runtime_mode}/1/2/3" ) )
+	sources_root("../../../projects/opc/psoi2")
 	cpp_sources Dir.glob( "../../../projects/opc/psoi2/src/**/*.cpp" )
+	mswin_rc_file("resource/resource.rc",
+						[ "../../../projects/opc/psoi2/resource/bitmaps/tree_img_list.bmp",
+						"../../../projects/opc/psoi2/resource/icons/102.ico" ] )
+	lib( "comctl32" )
+	lib( "Gdi32" )
 }
 File.copy '../../../projects/opc/psoi2/config.xml', '../../../output/projects/opc/psoi2/config.xml'
diff --git a/build_tools/mxx_ru/release/frl.test.fs_fn.release.rb b/build_tools/mxx_ru/release/frl.test.fs_fn.release.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.fs_fn.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_fs_fn")
 	include_path("../../../test/fs_fn")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.lexical_cast.release.rb b/build_tools/mxx_ru/release/frl.test.lexical_cast.release.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.lexical_cast.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_lexical_cast")
 	include_path("../../../test/lexical_cast")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.logging.release.rb b/build_tools/mxx_ru/release/frl.test.logging.release.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.logging.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_logging")
 	include_path("../../../test/logging")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.master_test.release.rb b/build_tools/mxx_ru/release/frl.test.master_test.release.rb
@@ -1,9 +1,12 @@
 require 'mxx_ru/cpp'
 require 'ftools'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.master_test.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_master_test")
 	include_path("../../../test/master_test")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.opc_address_space.release.rb b/build_tools/mxx_ru/release/frl.test.opc_address_space.release.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.opc_address_space.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_opc_address_space")
 	include_path("../../../test/opc_address_space")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.os_win32_registry.release.rb b/build_tools/mxx_ru/release/frl.test.os_win32_registry.release.rb
@@ -1,8 +1,11 @@
 require 'mxx_ru/cpp'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.os_win32_registry.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_os_win32_registry")
 	include_path("../../../test/os_win32_registry")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.poor_xml.release.rb b/build_tools/mxx_ru/release/frl.test.poor_xml.release.rb
@@ -1,9 +1,12 @@
 require 'mxx_ru/cpp'
 require 'ftools'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.poor_xml.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_poor_xml")
 	include_path("../../../test/poor_xml")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )

diff --git a/build_tools/mxx_ru/release/frl.test.psoi2_sender.debug.rb b/build_tools/mxx_ru/release/frl.test.psoi2_sender.debug.rb
@@ -1,9 +1,12 @@
 require 'mxx_ru/cpp'
 require 'ftools'
+require '../template/frl.test.template'
 
 MxxRu::Cpp::exe_target("frl.test.psoi2_sender.release.rb")\
 {
 	required_prj( "frl.lib.release.rb" )
+	test_setup()
+
 	target("test_psoi2_sender")
 	include_path("../../../test/psoi2_sender")
 	runtime_mode( MxxRu::Cpp::RUNTIME_RELEASE )