Merge pull request #1 from hakase-labs/update-0.9.2

Update to 0.9.2
hakase-labs · Jun 14, 2016 · 9b61c07 · 9b61c07
2 parents a2790f0 + d5f3cea
commit 9b61c07
Show file tree

Hide file tree

Showing 87 changed files with 21,746 additions and 4,736 deletions.
diff --git a/Doxyfile b/Doxyfile
diff --git a/README.md b/README.md
@@ -1,37 +1,48 @@
-sqrat
-=====
-
-Sqrat - Squirrel Binding Utility (version 0.8.2)
+# Sqrat - Squirrel Binding Utility #
 
 © 2009 Brandon Jones
+© 2011-2014 Li-Cheng (Andy) Tai
+© 2013-2015 Brandon Haffen AKA Wizzard
 
-© 2011 Li-Cheng (Andy) Tai
-
-Sqrat is a C++ binding utility for the Squirrel language. See the `docs` directory for usage info.
+Sqrat is a C++ binding utility for the Squirrel language.
+Up-to-date documentation can be created using Doxygen.
+Slightly outdated documentation can be found at
+http://scrat.sourceforge.net/0.9/
 
-Sqrat only contains C++ headers so for installation you just need to copy the files in the include directory to some common header path, such as `/usr/local/include`.
+Sqrat only contains C++ headers so for installation you just
+need to copy the files in the include directory to
+some common header path, such as /usr/local/include.
 
-However, an autotool based build system is included which allows you to install, on POSIX systems, with the familiar
+However, an autotool based build system can be checked out from
+the code repository (not in the relase tar file to reduce file size)
+which  allows you to install, on POSIX systems, with
+the familiar commands of
 
-    autotool/configure --prefix=<prefix path>
-    make && make install
+```
+autotool/configure --prefix=<prefix path>
+make && make install
+```
 
 You can then run
 
-    make check
+```
+make check
+```
+
+to run the unit tests.
 
-to run the unit tests. Alternatively you can follow the steps in `running_tests.txt` to directly run unit tests.
+Alternatively you can follow the steps in `running_tests.txt` to directly run unit tests.
 
-For more information, see `index.html` in the `docs` subdirectory.
+For more information, see `index.html` in the `docs` subdirectory
 
-Discussion and User Support
----------------------------
+## Discussion and User Support ##
 
-Discussion about Sqrat happens at the Squirrel language forum, he Bindings section
+Discussion about Sqrat happens at the Squirrel language forum,
+the Bindings section
 http://squirrel-lang.org/forums/default.aspx?g=topics&f=4
 
-Bug Reporting
--------------
+## Bug Reporting ##
 
-Bug reports or feature enhancement requests and patches can be submitted at the SourceForge Sqrat site
+Bug reports or feature enhancement requests and patches can
+be submitted at the SourceForge Sqrat site
 https://sourceforge.net/tracker/?group_id=261661&atid=2349886
diff --git a/gtest-1.3.0/CHANGES b/gtest-1.3.0/CHANGES
diff --git a/gtest-1.3.0/CONTRIBUTORS b/gtest-1.3.0/CONTRIBUTORS
diff --git a/gtest-1.3.0/COPYING b/gtest-1.3.0/COPYING
diff --git a/gtest-1.3.0/README b/gtest-1.3.0/README
diff --git a/gtest-1.3.0/build_gtest.sh b/gtest-1.3.0/build_gtest.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -ex
-g++ -I. -I./include -c src/gtest-all.cc && \
+g++ -fpermissive -I. -I./include -c src/gtest-all.cc && \
 ar -rv libgtest.a gtest-all.o
diff --git a/gtest-1.3.0/include/gtest/gtest-death-test.h b/gtest-1.3.0/include/gtest/gtest-death-test.h
diff --git a/gtest-1.3.0/include/gtest/gtest-message.h b/gtest-1.3.0/include/gtest/gtest-message.h
diff --git a/gtest-1.3.0/include/gtest/gtest-param-test.h b/gtest-1.3.0/include/gtest/gtest-param-test.h
@@ -155,7 +155,6 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
 
 #include <gtest/internal/gtest-internal.h>
 #include <gtest/internal/gtest-param-util.h>
-#include <gtest/internal/gtest-param-util-generated.h>
 
 namespace testing {
 
@@ -211,7 +210,6 @@ template <typename T>
 internal::ParamGenerator<T> Range(T start, T end) {
   return Range(start, end, 1);
 }
-
 // ValuesIn() function allows generation of tests with parameters coming from
 // a container.
 //
@@ -288,6 +286,13 @@ internal::ParamGenerator<typename Container::value_type> ValuesIn(
     const Container& container) {
   return ValuesIn(container.begin(), container.end());
 }
+
+
+}
+
+#include <gtest/internal/gtest-param-util-generated.h>
+
+namespace testing {
 
 // Values() allows generating tests from explicitly specified list of
 // parameters.

diff --git a/gtest-1.3.0/include/gtest/gtest-param-test.h.pump b/gtest-1.3.0/include/gtest/gtest-param-test.h.pump
diff --git a/gtest-1.3.0/include/gtest/gtest-spi.h b/gtest-1.3.0/include/gtest/gtest-spi.h
diff --git a/gtest-1.3.0/include/gtest/gtest-test-part.h b/gtest-1.3.0/include/gtest/gtest-test-part.h
diff --git a/gtest-1.3.0/include/gtest/gtest-typed-test.h b/gtest-1.3.0/include/gtest/gtest-typed-test.h
diff --git a/gtest-1.3.0/include/gtest/gtest.h b/gtest-1.3.0/include/gtest/gtest.h
diff --git a/gtest-1.3.0/include/gtest/gtest_pred_impl.h b/gtest-1.3.0/include/gtest/gtest_pred_impl.h
diff --git a/gtest-1.3.0/include/gtest/gtest_prod.h b/gtest-1.3.0/include/gtest/gtest_prod.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-death-test-internal.h b/gtest-1.3.0/include/gtest/internal/gtest-death-test-internal.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-filepath.h b/gtest-1.3.0/include/gtest/internal/gtest-filepath.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-internal.h b/gtest-1.3.0/include/gtest/internal/gtest-internal.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-linked_ptr.h b/gtest-1.3.0/include/gtest/internal/gtest-linked_ptr.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-param-util-generated.h b/gtest-1.3.0/include/gtest/internal/gtest-param-util-generated.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-param-util-generated.h.pump b/gtest-1.3.0/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-param-util.h b/gtest-1.3.0/include/gtest/internal/gtest-param-util.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-port.h b/gtest-1.3.0/include/gtest/internal/gtest-port.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-string.h b/gtest-1.3.0/include/gtest/internal/gtest-string.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-type-util.h b/gtest-1.3.0/include/gtest/internal/gtest-type-util.h
diff --git a/gtest-1.3.0/include/gtest/internal/gtest-type-util.h.pump b/gtest-1.3.0/include/gtest/internal/gtest-type-util.h.pump
diff --git a/gtest-1.3.0/src/gtest-all.cc b/gtest-1.3.0/src/gtest-all.cc
diff --git a/gtest-1.3.0/src/gtest-death-test.cc b/gtest-1.3.0/src/gtest-death-test.cc
diff --git a/gtest-1.3.0/src/gtest-filepath.cc b/gtest-1.3.0/src/gtest-filepath.cc
diff --git a/gtest-1.3.0/src/gtest-internal-inl.h b/gtest-1.3.0/src/gtest-internal-inl.h
diff --git a/gtest-1.3.0/src/gtest-port.cc b/gtest-1.3.0/src/gtest-port.cc
diff --git a/gtest-1.3.0/src/gtest-test-part.cc b/gtest-1.3.0/src/gtest-test-part.cc
diff --git a/gtest-1.3.0/src/gtest-typed-test.cc b/gtest-1.3.0/src/gtest-typed-test.cc
diff --git a/gtest-1.3.0/src/gtest.cc b/gtest-1.3.0/src/gtest.cc
@@ -2028,7 +2028,7 @@ void Test::Run() {
   if (!HasSameFixtureClass()) return;
 
   internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-#if GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS && !defined(__MINGW32__)
   // We are on Windows.
   impl->os_stack_trace_getter()->UponLeavingGTest();
   __try {
@@ -2262,7 +2262,7 @@ void TestInfoImpl::Run() {
   const TimeInMillis start = GetTimeInMillis();
 
   impl->os_stack_trace_getter()->UponLeavingGTest();
-#if GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS && !defined(__MINGW32__)
   // We are on Windows.
   Test* test = NULL;
 
@@ -3349,7 +3349,7 @@ void UnitTest::RecordPropertyForCurrentTest(const char* key,
 // We don't protect this under mutex_, as we only support calling it
 // from the main thread.
 int UnitTest::Run() {
-#if GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS && !defined(__MINGW32__)
 
   const bool in_death_test_child_process =
       internal::GTEST_FLAG(internal_run_death_test).GetLength() > 0;

diff --git a/gtest-1.3.0/src/gtest_main.cc b/gtest-1.3.0/src/gtest_main.cc
diff --git a/include/sqmodule.h b/include/sqmodule.h
@@ -34,11 +34,11 @@
 extern "C" {
 #endif
 
-    /* HSQAPI */
-    /*
-        Allows modules to interface with squirrel's C api without linking to the squirrel library
-        If new functions are added to the Squirrel API, they should be added here too
-    */
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /// @cond DEV
+    /// Allows modules to interface with Squirrel's C api without linking to the squirrel library
+    /// If new functions are added to the Squirrel API, they should be added here too
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     typedef struct {
         /*vm*/
         HSQUIRRELVM     (*open)(SQInteger initialstacksize);
@@ -191,6 +191,7 @@ extern "C" {
         void            (*setdebughook)(HSQUIRRELVM v);
     } sq_api;
     typedef sq_api* HSQAPI;
+    /// @endcond
 
 #ifdef __cplusplus
 } /*extern "C"*/

diff --git a/include/sqrat.h b/include/sqrat.h
@@ -25,6 +25,34 @@
 //  distribution.
 //
 
+/*! \mainpage Sqrat Main Page
+ *
+ * \section intro_sec Introduction
+ *
+ * Sqrat is a C++ library for Squirrel that facilitates exposing classes and other native functionality to Squirrel scripts. It models the underlying Squirrel API closely to give access to a wider range of functionality than other binding libraries. In addition to the binding library, Sqrat features a threading library and a module import library.
+ *
+ * \section install_sec Installation
+ *
+ * Sqrat only contains C++ headers so for installation you just need to copy the files in the include directory to some common header path.
+ *
+ * \section sec_faq Frequently Asked Questions
+ *
+ * Q: My application is crashing when I call sq_close. Why is this happening?<br>
+ * A: All Sqrat::Object instances and derived type instances must be destroyed before calling sq_close.
+ *
+ * \section discuss_sec Discussion and User Support
+ *
+ * Discussion about Sqrat happens at the Squirrel language forum, the Bindings section
+ * http://squirrel-lang.org/forums/default.aspx?g=topics&f=4
+ *
+ * \section bug_sec Bug Reporting
+ *
+ * Bug reports or feature enhancement requests and patches can be submitted at the SourceForge Sqrat site
+ * https://sourceforge.net/p/scrat/sqrat/
+ *
+ * You're invited to make documentation suggestions for Sqrat. Together, we can make Sqrat as easy to understand as possible!
+ */
+
 #if !defined(_SCRAT_MAIN_H_)
 #define _SCRAT_MAIN_H_