Permalink
Browse files

Lots of changes with this one:

- Added various regex matches for autotools support to .gitignore
- Renamed LICENSE to COPYING in compliance with autotools standards
- Moved Boost UTF startup code out of TestAPDU.cpp and into
  TestStartBoostUTF.cpp
- Renamed README.markdown to README to support autotools standards
  • Loading branch information...
1 parent 40c8048 commit 622f6fe2cda9735a4a7b9d242a597a3f4ab78665 @cverges cverges committed Jun 1, 2011
Showing with 185 additions and 104 deletions.
  1. +34 −0 .gitignore
  2. +0 −32 LICENSE → COPYING
  3. +0 −1 DNP3Test/TestAPDU.cpp
  4. +36 −0 DNP3Test/TestStartBoostUTF.cpp
  5. +115 −71 README.markdown → README
View
@@ -22,4 +22,38 @@ TestAPL/TestSingle.tiny.xml
TestSingle.tiny.xml
/doc
/coverage-*
+*~
+*.o
+*.lo
+.deps
+.dirstamp
+.libs
+*.la
+*.so
+
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.guess
+/config.h.in
+/config.sub
+/configure
+/depcomp
+/install-sh
+/ltmain.sh
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/missing
+/config
+configure.in
+configure
+Makefile.in
+Makefile
+config.h
+config.status
+libtool
+stamp-h1
View
@@ -1,6 +1,3 @@
-=========================================================================
-== Apache License ==
-=========================================================================
Apache License
Version 2.0, January 2004
@@ -203,32 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-=========================================================================
-== Boost License ==
-=========================================================================
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
View
@@ -16,7 +16,6 @@
// specific language governing permissions and limitations
// under the License.
//
-#define BOOST_TEST_MODULE dnp3
#include <boost/test/unit_test.hpp>
#include <APLTestTools/TestHelpers.h>
@@ -0,0 +1,36 @@
+//
+// Licensed to Green Energy Corp (www.greenenergycorp.com) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. Green Enery Corp licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+/*
+ * Define the Boost UTF module name
+ */
+#define BOOST_TEST_MODULE dnp3
+
+/*
+ * If we aren't using dynamic linking, make sure a main() function
+ * is created anyway.
+ */
+#ifndef BOOST_TEST_DYN_LINK
+ #define BOOST_TEST_MAIN
+#endif
+
+/*
+ * Include the Boost UTF subsystem. The rest is automagic.
+ */
+#include <boost/test/unit_test.hpp>
Oops, something went wrong.

0 comments on commit 622f6fe

Please sign in to comment.