change license

tecnalia-advancedmanufacturing-robotics · Feb 14, 2020 · a9d8f7f · a9d8f7f
1 parent d40f673
commit a9d8f7f
Show file tree

Hide file tree

Showing 18 changed files with 220 additions and 113 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![license - apache 2.0](https://img.shields.io/:license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+
 # Package generator
 
 The following packages are about the automatic creation of ROS packages (so far C++ and python).
@@ -14,7 +16,7 @@ To do so the input needed are:
 
 **Affiliation** : Tecnalia Research and Innovation, Spain
 
-**License**: This project is under the NPOSL-3.0 License.
+**License**: This project is under the Apache 2.0 License.
 See [LICENSE.md](LICENSE.md) for more details.
 
 <a href="http://www.youtube.com/watch?feature=player_embedded&v=qsNkYGQBW8U

diff --git a/package_generator/scripts/generate_package b/package_generator/scripts/generate_package
@@ -3,5 +3,6 @@
 from package_generator.generate_package import main
 import sys
 
+
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/package_generator/src/package_generator/code_generator.py b/package_generator/src/package_generator/code_generator.py
@@ -6,7 +6,7 @@
 @brief parse a ros template file, and generate the related file
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 
 import re

diff --git a/package_generator/src/package_generator/enhanced_object.py b/package_generator/src/package_generator/enhanced_object.py
@@ -6,7 +6,7 @@
 @brief Common tools for python classes
 
 Copyright (C) 2018 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license
 """
 
 from termcolor import colored

diff --git a/package_generator/src/package_generator/file_update_management.py b/package_generator/src/package_generator/file_update_management.py
@@ -6,7 +6,7 @@
 @brief responsible of the management of file update
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 
 from copy import deepcopy

diff --git a/package_generator/src/package_generator/generate_package.py b/package_generator/src/package_generator/generate_package.py
@@ -7,7 +7,7 @@
  generates the package according to the xml definition
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 
 """
 

diff --git a/package_generator/src/package_generator/package_xml_parser.py b/package_generator/src/package_generator/package_xml_parser.py
@@ -6,7 +6,7 @@
 @brief parse an xml file describing a package content
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 
 """
 

diff --git a/package_generator/src/package_generator/template_spec.py b/package_generator/src/package_generator/template_spec.py
@@ -6,7 +6,7 @@
 @brief generate the disctionnary for the package generator
 
 Copyright (C) 2018 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 from package_generator.enhanced_object import EnhancedObject
 import yaml

diff --git a/package_generator/tests/test_code_generator.py b/package_generator/tests/test_code_generator.py
@@ -6,7 +6,7 @@
 @brief test the code generator
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 
 To run a single test, type:
 python test_code_generator.py CodeGeneratorTest.test_apply_function

diff --git a/package_generator/tests/test_jinja_generator.py b/package_generator/tests/test_jinja_generator.py
@@ -6,7 +6,7 @@
 @brief test the code generator
 
 Copyright (C) 2019 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 
 To run a single test, type:
 python test_jinja_generator.py JinjaGeneratorTest.test_is_launching

diff --git a/package_generator/tests/test_package_generator.py b/package_generator/tests/test_package_generator.py
@@ -6,7 +6,7 @@
 @brief test the package generator
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 
 import unittest

diff --git a/package_generator/tests/test_template_config.py b/package_generator/tests/test_template_config.py
@@ -6,7 +6,7 @@
 @brief test the dictionary generator
 
 Copyright (C) 2018 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 
 To run a single test, type:
 python test_code_generator.py CodeGeneratorTest.test_apply_function

diff --git a/package_generator/tests/test_template_sanity.py b/package_generator/tests/test_template_sanity.py
@@ -6,7 +6,7 @@
 @brief test the template sanity checker
 
 Copyright (C) 2019 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 
 # TODO should these packages added to the packages.xml?

diff --git a/package_generator/tests/test_update.py b/package_generator/tests/test_update.py
@@ -6,7 +6,7 @@
 @brief test the management of update of existing node
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 
 import unittest

diff --git a/package_generator/tests/test_xml_parser.py b/package_generator/tests/test_xml_parser.py
@@ -6,7 +6,7 @@
 @brief test the xml parser
 
 Copyright (C) 2017 Tecnalia Research and Innovation
-Distributed under the Non-Profit Open Software License 3.0 (NPOSL-3.0).
+Distributed under the Apache 2.0 license.
 """
 
 import unittest

diff --git a/package_generator_templates/CMakeLists.txt b/package_generator_templates/CMakeLists.txt
@@ -7,46 +7,7 @@ find_package(catkin REQUIRED)
 ###################################
 ## catkin specific configuration ##
 ###################################
-## The catkin_package macro generates cmake config files for your package
-## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if your package contains header files
-## LIBRARIES: libraries you create in this project that dependent projects also need
-## CATKIN_DEPENDS: catkin_packages dependent projects also need
-## DEPENDS: system dependencies of this project that dependent projects also need
-catkin_package(
-#  INCLUDE_DIRS include
-#  LIBRARIES package_generator_templates
-#  CATKIN_DEPENDS other_catkin_pkg
-#  DEPENDS system_lib
-)
-
-#############
-## Install ##
-#############
-
-# all install targets should use catkin DESTINATION variables
-# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
-
-## Mark executable scripts (Python etc.) for installation
-## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
-#   scripts/my_python_script
-#   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-# )
-
-## Mark executables and/or libraries for installation
-# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node
-#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-# )
-
-## Mark cpp header files for installation
-# install(DIRECTORY include/${PROJECT_NAME}/
-#   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-#   FILES_MATCHING PATTERN "*.h"
-#   PATTERN ".svn" EXCLUDE
-# )
+catkin_package()
 
 ## Mark other files for installation (e.g. launch and bag files, etc.)
 install(DIRECTORY

diff --git a/package_generator_templates/README.md b/package_generator_templates/README.md
@@ -6,7 +6,7 @@ This package gathers templates proposed for the `package_generator`.
 
 **Affiliation**: Tecnalia Research and Innovation, Spain
 
-**License**: This project is under the NPOSL-3.0 License.
+**License**: This project is under the pache 2.0 License.
 See [LICENSE.md](../LICENSE.md) for more details.
 
 ## Getting Started