• R/O
  • SSH
  • HTTPS

iris-fmw: Commit


Commit MetaInfo

Revision276 (tree)
Time2012-02-09 17:36:58
Authorshirayanagi

Log Message

nacl 更新
angelscript 更新

Change Summary

Incremental Difference

--- trunk/framework/sample/Windows/unittest/src/nacl_test/nacl_test.bat (revision 275)
+++ trunk/framework/sample/Windows/unittest/src/nacl_test/nacl_test.bat (revision 276)
@@ -17,8 +17,8 @@
1717 rem SET CHROME_OPTION=--enable-nacl --new-window
1818 SET CHROME_OPTION=--enable-nacl
1919 rem 標準出力 & 標準エラー の出力パスを設定
20-rem SET NACL_EXE_STDOUT=stdout.txt
21-rem SET NACL_EXE_STDERR=stderr.txt
20+SET NACL_EXE_STDOUT=%~dp0\stdout.txt
21+SET NACL_EXE_STDERR=%~dp0\stderr.txt
2222 rem SET CHROME_OPTION=%CHROME_OPTION% --no-sandbox
2323
2424 if not exist "%HOME%\Local Settings\Application Data\Google\Chrome\Application\chrome.exe" (
--- trunk/framework/sample/Windows/unittest/src/nacl_test/iutest/main.cpp (revision 275)
+++ trunk/framework/sample/Windows/unittest/src/nacl_test/iutest/main.cpp (revision 276)
@@ -7,9 +7,13 @@
77 /*
88 * include testing framework
99 */
10-#include "iutest.h"
11-//#include "gtest/iutest_switch.h"
10+#define IUTEST_VPRINTF iutest::nacl::vprint_message
11+#define IUTEST_PRINTF iutest::nacl::print_message
1212
13+#include "iutest.hpp"
14+//#include "gtest/iutest_switch.hpp"
15+
16+
1317 class FooEnvironment : public iutest::Environment
1418 {
1519 virtual void SetUp(void)
@@ -24,8 +28,6 @@
2428
2529 int iutest_main(std::vector<std::string> argv)
2630 {
27- int argc = argv.size();
28-
2931 #if 0
3032 iutest::detail::auto_ptr<iutest::Environment> env = iutest::AddGlobalTestEnvironment(new FooEnvironment());
3133 FooEnvironment env2;
--- trunk/framework/sample/Windows/unittest/src/nacl_test/iutest/index.html (revision 275)
+++ trunk/framework/sample/Windows/unittest/src/nacl_test/iutest/index.html (revision 276)
@@ -6,7 +6,7 @@
66
77
88 <head>
9-<title>test</title>
9+<title>iutest</title>
1010 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
1111 <script type="text/javascript" src="http://www.google.com/jsapi"></script>
1212 <script type="text/javascript">google.load("jquery", "1.5");</script>
@@ -55,7 +55,7 @@
5555
5656 function main() {
5757 var inputBox = document.forms.iutestForm.inputBox;
58- helloWorldModule.postMessage('main:' + inputBox.value);
58+ hModule.postMessage('iutest_main:' + inputBox.value);
5959 }
6060
6161 // Set the global status message. If the element with id 'statusField'
--- trunk/framework/sample/Windows/unittest/src/nacl_test/iutest/sub.cpp (revision 275)
+++ trunk/framework/sample/Windows/unittest/src/nacl_test/iutest/sub.cpp (revision 276)
@@ -7,7 +7,7 @@
77 /*
88 * include testing framework
99 */
10-#include "iutest.h"
10+#include "iutest.hpp"
1111
1212 #if 1 // Success Tests
1313
--- trunk/framework/src/web/nacl/debug/NaclDebug.h (revision 275)
+++ trunk/framework/src/web/nacl/debug/NaclDebug.h (revision 276)
@@ -24,6 +24,7 @@
2424 #if defined(IRIS_NACL)
2525 #include "../object/NaclVar.h"
2626 #include "../core/NaclEntry.h"
27+#include <ppapi/cpp/instance.h>
2728
2829 namespace iris {
2930 namespace nacl
@@ -48,6 +49,17 @@
4849 }
4950 }
5051
52+STATICINLINE void printMessage(const char* fmt, ...)
53+{
54+ // FIXME: 固定長
55+ char buf[1024];
56+ va_list va;
57+ va_start(va, fmt);
58+ vsnprintf(buf, sizeof(buf), fmt, va);
59+ va_end(va);
60+ OutputDebugVar(buf);
61+}
62+
5163 } // end of namespace nacl
5264 } // end of namespace iris
5365
--- trunk/framework/src/script/angelscript/AsSystem.cpp (revision 275)
+++ trunk/framework/src/script/angelscript/AsSystem.cpp (revision 276)
@@ -19,10 +19,8 @@
1919 //======================================================================
2020 // include
2121 #include "AsSystem.h"
22+#include "AsAddOn.h"
2223 #include <string>
23-
24-// add on
25-#include "../../add_on/scriptstdstring/scriptstdstring.h"
2624 #include "../../iris_debug.h"
2725
2826 #ifdef _IRIS_SUPPORT_ANGELSCRIPT
@@ -128,7 +126,7 @@
128126
129127 // add_on
130128 {
131- RegisterStdString(m_pEngine);
129+ CAsAddOn::Register(m_pEngine);
132130 }
133131 // 関数登録
134132 {
--- trunk/framework/src/script/angelscript/AsAddOn.cpp (nonexistent)
+++ trunk/framework/src/script/angelscript/AsAddOn.cpp (revision 276)
@@ -0,0 +1,50 @@
1+//======================================================================
2+//-----------------------------------------------------------------------
3+/**
4+ * @file AsAddOn.cpp
5+ * @brief angelscript モジュール ファイル
6+ *
7+ * @author t.sirayanagi
8+ * @version 1.0
9+ *
10+ * @par copyright
11+ * Copyright (C) 2012 Takazumi Shirayanagi\n
12+ * The new BSD License is applied to this software.
13+ * see iris_LICENSE.txt
14+*/
15+//-----------------------------------------------------------------------
16+//======================================================================
17+#define INCG_IRIS_AsAddOn_CPP_
18+
19+//======================================================================
20+// include
21+#include "AsAddOn.h"
22+
23+#ifdef _IRIS_SUPPORT_ANGELSCRIPT
24+
25+#include "../../add_on/scriptstdstring/scriptstdstring.h"
26+#include "../../add_on/scriptstdstring/scriptstdstring.cpp"
27+#include "../../add_on/scriptstdstring/scriptstdstring_utils.cpp"
28+
29+#include "../../add_on/scriptarray/scriptarray.h"
30+#include "../../add_on/scriptarray/scriptarray.cpp"
31+
32+namespace iris {
33+namespace as
34+{
35+
36+/**********************************************************************//**
37+ *
38+ * AddOn の追加
39+ *
40+*//***********************************************************************/
41+void CAsAddOn::Register(asIScriptEngine *engine)
42+{
43+ RegisterStdString(engine);
44+ RegisterStdStringUtils(engine);
45+}
46+
47+} // end of namespace as
48+} // end of namespace iris
49+
50+#endif
--- trunk/framework/src/script/angelscript/AsAddOn.h (nonexistent)
+++ trunk/framework/src/script/angelscript/AsAddOn.h (revision 276)
@@ -0,0 +1,48 @@
1+//======================================================================
2+//-----------------------------------------------------------------------
3+/**
4+ * @file AsAddOn.h
5+ * @brief angelscript モジュール ファイル
6+ *
7+ * @author t.sirayanagi
8+ * @version 1.0
9+ *
10+ * @par copyright
11+ * Copyright (C) 2012 Takazumi Shirayanagi\n
12+ * The new BSD License is applied to this software.
13+ * see iris_LICENSE.txt
14+*/
15+//-----------------------------------------------------------------------
16+//======================================================================
17+#ifndef INCG_IRIS_AsAddOn_H_
18+#define INCG_IRIS_AsAddOn_H_
19+
20+//======================================================================
21+// include
22+#include "as_inchead.h"
23+#include "../../iris_object.h"
24+
25+#ifdef _IRIS_SUPPORT_ANGELSCRIPT
26+
27+namespace iris {
28+namespace as
29+{
30+
31+//======================================================================
32+// class
33+/**
34+ * @ingroup as
35+ * @brief AngelScript Module クラス
36+*/
37+class CAsAddOn : public IIrisObject
38+{
39+public:
40+ static void Register(asIScriptEngine *engine);
41+};
42+
43+} // end of namespace as
44+} // end of namespace iris
45+
46+#endif
47+
48+#endif
Show on old repository browser