Skip to content
Snippets Groups Projects
Commit da289d63 authored by Daniel Stonier's avatar Daniel Stonier
Browse files

remove catkin package information from the create package script (needs to...

remove catkin package information from the create package script (needs to migrate to init repo script).
parent 63e8f2c3
Branches
Tags
No related merge requests found
...@@ -37,17 +37,19 @@ def parse_arguments(): ...@@ -37,17 +37,19 @@ def parse_arguments():
parser.add_argument('dependencies', parser.add_argument('dependencies',
nargs='*', nargs='*',
help='Android library dependencies') help='Android library dependencies')
parser.add_argument('-l', '--license',
action='append', # need to move all this catkin stuff to android_init_repo
default=["Apache 2.0"], # parser.add_argument('-l', '--license',
help='Name for License, (e.g. BSD, MIT, GPLv3...)[BSD]') # action='append',
parser.add_argument('-a', '--author', # default=["Apache 2.0"],
action='append', # help='Name for License, (e.g. BSD, MIT, GPLv3...)[BSD]')
default=[utils.author_name()], # parser.add_argument('-a', '--author',
help='A single author, may be used multiple times') # action='append',
parser.add_argument('-m', '--maintainer', # default=[utils.author_name()],
action='append', # help='A single author, may be used multiple times')
help='A single maintainer, may be used multiple times') # parser.add_argument('-m', '--maintainer',
# action='append',
# help='A single maintainer, may be used multiple times')
parser.add_argument('-V', '--pkg_version', parser.add_argument('-V', '--pkg_version',
action='store', action='store',
default="0.1.0", default="0.1.0",
...@@ -125,38 +127,39 @@ def create_catkin_package_files(args, is_library, sdk_version): ...@@ -125,38 +127,39 @@ def create_catkin_package_files(args, is_library, sdk_version):
plugin_name = "android-library" if is_library else "android" plugin_name = "android-library" if is_library else "android"
try: try:
package_name = args.name[0].lower() package_name = args.name[0].lower()
parent_path = os.getcwd() # Also should move to init repo instead of here.
target_path = utils.validate_path(os.path.join(parent_path, package_name)) # parent_path = os.getcwd()
build_depends = [] # target_path = utils.validate_path(os.path.join(parent_path, package_name))
if 'rosjava_tools' not in args.dependencies: # build_depends = []
build_depends.append('rosjava_tools') # if 'rosjava_tools' not in args.dependencies:
for depend_name in args.dependencies: # build_depends.append('rosjava_tools')
build_depends.append(catkin_pkg.package.Dependency(depend_name)) # for depend_name in args.dependencies:
package_template = PackageTemplate._create_package_template( # build_depends.append(catkin_pkg.package.Dependency(depend_name))
package_name=package_name, # package_template = PackageTemplate._create_package_template(
description=args.description, # package_name=package_name,
licenses=args.license or [], # description=args.description,
maintainer_names=args.maintainer, # licenses=args.license or [],
author_names=args.author, # maintainer_names=args.maintainer,
version=args.pkg_version, # author_names=args.author,
catkin_deps=[], # version=args.pkg_version,
system_deps=[], # catkin_deps=[],
boost_comps=None) # system_deps=[],
package_template.exports = [] # boost_comps=None)
package_template.build_depends = build_depends # package_template.exports = []
package_xml = create_package_xml(package_template=package_template, rosdistro='groovy') # package_template.build_depends = build_depends
# package_xml = create_package_xml(package_template=package_template, rosdistro='groovy')
package_path = os.path.abspath(os.path.join(os.getcwd(), package_name)) package_path = os.path.abspath(os.path.join(os.getcwd(), package_name))
filename = os.path.join(package_path, 'package.xml') console.pretty_println("\nCreating gradle files", console.bold)
console.pretty_println("\nCreating catkin/gradle files", console.bold) # try:
try: # filename = os.path.join(package_path, 'package.xml')
f = open(filename, 'w') # f = open(filename, 'w')
f.write(package_xml) # f.write(package_xml)
console.pretty_print(' File: ', console.cyan) # console.pretty_print(' File: ', console.cyan)
console.pretty_println('package.xml', console.yellow) # console.pretty_println('package.xml', console.yellow)
finally: # finally:
f.close() # f.close()
# Other files # Other files
for template_name in ['build.gradle', 'CMakeLists.txt']: for template_name in ['build.gradle']: # 'CMakeLists.txt']:
filename = os.path.join(package_path, template_name) filename = os.path.join(package_path, template_name)
template = read_template_file(template_name) template = read_template_file(template_name)
contents = instantiate_template(template, package_name, args.author[0], plugin_name, sdk_version) contents = instantiate_template(template, package_name, args.author[0], plugin_name, sdk_version)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment