Mxx_ru 1.3.0 → 1.3.1

data/tests/cpp/cpp_sources_glob/build.rb

@@ -1,7 +1,7 @@
-require 'mxx_ru/cpp'
-
-Mxx_ru::Cpp::composite_target( Mxx_ru::BUILD_ROOT ) {
-  global_include_path '.'
-
-  required_prjs Dir.glob( '**/prj.rb' )
-}
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::composite_target( Mxx_ru::BUILD_ROOT ) {
+  global_include_path '.'
+
+  required_prjs Dir.glob( '**/prj.rb' )
+}

data/tests/cpp/cpp_sources_glob/some/module/prj.rb

@@ -1,10 +1,10 @@
-require 'mxx_ru/cpp'
-
-Mxx_ru::Cpp::exe_target {
-
-  Mxx_ru::enable_show_brief
-
-  target( 'test' )
-
-  cpp_sources Dir.glob( 'some/module/**/*.cpp' )
-}
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::exe_target {
+
+  Mxx_ru::enable_show_brief
+
+  target( 'test' )
+
+  cpp_sources Dir.glob( 'some/module/**/*.cpp' )
+}

data/tests/cpp/cpp_sources_glob/tc_cpp_sources_glob.rb

@@ -1,18 +1,18 @@
-require 'test/unit'
-
-require File.dirname( __FILE__ ) + '/../../test_with_compilation'
-
-class TC_CppSourcesGlob < Test::Unit::TestCase
-  include TestWithCompilation
-
-  test_path 'tests/cpp/cpp_sources_glob'
-
-  test_case :successful_compile_and_link do
-    assert_nothing_raised {
-      build( 'build.rb' )
-      clean( 'build.rb' )
-    }
-  end
-
-end
-
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_CppSourcesGlob < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/cpp/cpp_sources_glob'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'build.rb' )
+      clean( 'build.rb' )
+    }
+  end
+
+end
+

data/tests/cpp/mswin_res_dll/build.rb

@@ -1,14 +1,14 @@
-require	'mxx_ru/cpp'
-
-class	Build < Mxx_ru::Cpp::Composite_target
-	def	initialize( a_alias = Mxx_ru::BUILD_ROOT )
-		super( a_alias )
-
-		global_include_path( "h" )
-
-		required_prj( "main.rb" )
-
-	end
-end
-
-Mxx_ru::setup_target( Build.new )
+require	'mxx_ru/cpp'
+
+class	Build < Mxx_ru::Cpp::Composite_target
+	def	initialize( a_alias = Mxx_ru::BUILD_ROOT )
+		super( a_alias )
+
+		global_include_path( "h" )
+
+		required_prj( "main.rb" )
+
+	end
+end
+
+Mxx_ru::setup_target( Build.new )

data/tests/cpp/mswin_res_dll/dll.cpp

@@ -1,17 +1,17 @@
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include <dll.hpp>
-
-SPEC
-int	say_hello()
-	{
-		MessageBox( GetDesktopWindow(),
-			"mswin_res_dll successfully started",
-			"Hello!",
-			MB_OK | MB_ICONINFORMATION );
-
-		return 0;
-	}
-
-
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <dll.hpp>
+
+SPEC
+int	say_hello()
+	{
+		MessageBox( GetDesktopWindow(),
+			"mswin_res_dll successfully started",
+			"Hello!",
+			MB_OK | MB_ICONINFORMATION );
+
+		return 0;
+	}
+
+

data/tests/cpp/mswin_res_dll/dll.rb

@@ -1,30 +1,30 @@
-require	'mxx_ru/cpp'
-
-class	Dll	< Mxx_ru::Cpp::Dll_target
-	def	initialize( a_alias = "dll.rb" )
-		super( a_alias )
-
-		target( "dll" )
-		implib_path( "o" )
-
-		cpp_source( "dll.cpp" )
-
-		define( "DLL_PRJ" )
-
-		mswin_rc_include_path( "h" )
-		mswin_rc_file( "dll.rc",
-			[   "h/res.h",
-				"res/tree_fol.bmp",
-				"res/tree_state_1.bmp",
-				"res/tree_state_2.bmp" ] )
-
-		lib( "user32.lib" )
-
-		if "bcc" == toolset.name
-			mswin_rc_include_path( "d:\\usr\\bin\\bc6\\include" )
-		end
-
-	end
-end
-
+require	'mxx_ru/cpp'
+
+class	Dll	< Mxx_ru::Cpp::Dll_target
+	def	initialize( a_alias = "dll.rb" )
+		super( a_alias )
+
+		target( "dll" )
+		implib_path( "o" )
+
+		cpp_source( "dll.cpp" )
+
+		define( "DLL_PRJ" )
+
+		mswin_rc_include_path( "h" )
+		mswin_rc_file( "dll.rc",
+			[   "h/res.h",
+				"res/tree_fol.bmp",
+				"res/tree_state_1.bmp",
+				"res/tree_state_2.bmp" ] )
+
+		lib( "user32.lib" )
+
+		if "bcc" == toolset.name
+			mswin_rc_include_path( "d:\\usr\\bin\\bc6\\include" )
+		end
+
+	end
+end
+
 Mxx_ru::setup_target( Dll.new )

data/tests/cpp/mswin_res_dll/dll.rc

@@ -1,48 +1,48 @@
-#include <windows.h>
-
-#include <res.h>
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-#endif
-
-IDB_TREE_STATE_NORMAL   BITMAP  MOVEABLE PURE   "res\\tree_state_1.bmp"
-IDB_TREE_STATE_MASK     BITMAP  MOVEABLE PURE   "res\\tree_state_2.bmp"
-IDB_TREE_FOLDER         BITMAP  MOVEABLE PURE   "res\\tree_fol.bmp"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "org.eao197\0"
-            VALUE "FileDescription", "Mxx_ru mswin_res_dll test\0"
-            VALUE "FileVersion", "1, 0, 0, 0\0"
-            VALUE "InternalName", "mswin_res_dll\0"
-            VALUE "LegalCopyright", "Copyright (C) 2004 Yauheni A. Akhotnikau\0"
-            VALUE "LegalTrademarks", "Mxx_ru (R)\0"
-            VALUE "OriginalFilename", "dll.dll\0"
-            VALUE "ProductName", "Mxx_ru\0"
-            VALUE "ProductVersion", "1, 0, 0, 0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+#include <windows.h>
+
+#include <res.h>
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+#ifdef _WIN32
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+#endif //_WIN32
+#endif
+
+IDB_TREE_STATE_NORMAL   BITMAP  MOVEABLE PURE   "res\\tree_state_1.bmp"
+IDB_TREE_STATE_MASK     BITMAP  MOVEABLE PURE   "res\\tree_state_2.bmp"
+IDB_TREE_FOLDER         BITMAP  MOVEABLE PURE   "res\\tree_fol.bmp"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "org.eao197\0"
+            VALUE "FileDescription", "Mxx_ru mswin_res_dll test\0"
+            VALUE "FileVersion", "1, 0, 0, 0\0"
+            VALUE "InternalName", "mswin_res_dll\0"
+            VALUE "LegalCopyright", "Copyright (C) 2004 Yauheni A. Akhotnikau\0"
+            VALUE "LegalTrademarks", "Mxx_ru (R)\0"
+            VALUE "OriginalFilename", "dll.dll\0"
+            VALUE "ProductName", "Mxx_ru\0"
+            VALUE "ProductVersion", "1, 0, 0, 0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

data/tests/cpp/mswin_res_dll/h/dll.hpp

@@ -1,8 +1,8 @@
-#if !defined( DLL_PRJ )
-	#define SPEC __declspec(dllimport)
-#else
-	#define SPEC __declspec(dllexport)
-#endif
-
-SPEC
-int	say_hello();
+#if !defined( DLL_PRJ )
+	#define SPEC __declspec(dllimport)
+#else
+	#define SPEC __declspec(dllexport)
+#endif
+
+SPEC
+int	say_hello();

data/tests/cpp/mswin_res_dll/h/res.h

@@ -1,3 +1,3 @@
-#define	IDB_TREE_STATE_NORMAL   1001
-#define	IDB_TREE_STATE_MASK     1002
-#define	IDB_TREE_FOLDER         1003
+#define	IDB_TREE_STATE_NORMAL   1001
+#define	IDB_TREE_STATE_MASK     1002
+#define	IDB_TREE_FOLDER         1003

data/tests/cpp/mswin_res_dll/main.cpp

@@ -1,13 +1,13 @@
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include <dll.hpp>
-
-int CALLBACK WinMain(
-	HINSTANCE hInstance,
-	HINSTANCE hPrevInstance,
-	LPSTR lpCmdLine,
-	int nCmdShow )
-	{
-		return say_hello();
-	}
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <dll.hpp>
+
+int CALLBACK WinMain(
+	HINSTANCE hInstance,
+	HINSTANCE hPrevInstance,
+	LPSTR lpCmdLine,
+	int nCmdShow )
+	{
+		return say_hello();
+	}

data/tests/cpp/mswin_res_dll/main.rb

@@ -1,20 +1,20 @@
-require	'mxx_ru/cpp'
-
-class	Exe	< Mxx_ru::Cpp::Exe_target
-	def	initialize( a_alias = "main.rb" )
-		super( a_alias )
-
-		target( "mswin_res_dll" )
-		screen_mode( Mxx_ru::Cpp::SCREEN_WINDOW )
-
-		required_prj( "dll.rb" )
-
-		cpp_source( "main.cpp" )
-
-		if "vc" == toolset.name
-			lib( "user32.lib" )
-		end
-	end
-end
-
+require	'mxx_ru/cpp'
+
+class	Exe	< Mxx_ru::Cpp::Exe_target
+	def	initialize( a_alias = "main.rb" )
+		super( a_alias )
+
+		target( "mswin_res_dll" )
+		screen_mode( Mxx_ru::Cpp::SCREEN_WINDOW )
+
+		required_prj( "dll.rb" )
+
+		cpp_source( "main.cpp" )
+
+		if "vc" == toolset.name
+			lib( "user32.lib" )
+		end
+	end
+end
+
 Mxx_ru::setup_target( Exe.new )

data/tests/cpp/mswin_res_dll/tc_mswin_res_dll.rb

@@ -1,18 +1,18 @@
-require 'test/unit'
-
-require File.dirname( __FILE__ ) + '/../../test_with_compilation'
-
-class TC_MSWinResDll < Test::Unit::TestCase
-  include TestWithCompilation
-
-  test_path 'tests/cpp/mswin_res_dll'
-
-  test_case :successful_compile_and_link do
-    assert_nothing_raised {
-      build( 'build.rb' )
-      clean( 'build.rb' )
-    }
-  end
-
-end
-
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_MSWinResDll < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/cpp/mswin_res_dll'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'build.rb' )
+      clean( 'build.rb' )
+    }
+  end
+
+end
+

data/tests/cpp/mswin_res_exe/build.rb

@@ -1,23 +1,23 @@
-require 'mxx_ru/cpp'
-
-Mxx_ru::setup_target(
-	Mxx_ru::Cpp::Exe_target.new( Mxx_ru::BUILD_ROOT ) {
-		target( "mswin_res_exe" )
-		screen_mode( Mxx_ru::Cpp::SCREEN_WINDOW )
-
-		cpp_source( "main.cpp" )
-
-		mswin_rc_include_path( "h" )
-		mswin_rc_file( "main.rc",
-			[   "h/res.h",
-				"res/tree_fol.bmp",
-				"res/tree_state_1.bmp",
-				"res/tree_state_2.bmp" ] )
-
-		lib( "user32.lib" )
-
-		if "bcc" == toolset.name
-			mswin_rc_include_path( "d:\\usr\\bin\\bc6\\include" )
-		end
-	}
-)
+require 'mxx_ru/cpp'
+
+Mxx_ru::setup_target(
+	Mxx_ru::Cpp::Exe_target.new( Mxx_ru::BUILD_ROOT ) {
+		target( "mswin_res_exe" )
+		screen_mode( Mxx_ru::Cpp::SCREEN_WINDOW )
+
+		cpp_source( "main.cpp" )
+
+		mswin_rc_include_path( "h" )
+		mswin_rc_file( "main.rc",
+			[   "h/res.h",
+				"res/tree_fol.bmp",
+				"res/tree_state_1.bmp",
+				"res/tree_state_2.bmp" ] )
+
+		lib( "user32.lib" )
+
+		if "bcc" == toolset.name
+			mswin_rc_include_path( "d:\\usr\\bin\\bc6\\include" )
+		end
+	}
+)