Skip to content

Add templates for .dsv files #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
esteve merged 2 commits into from
May 7, 2020
Merged

Add templates for .dsv files #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36a59b
Add templates for .dsv files
jacobperron Oct 17, 2019
dcb45ee
Drop old sh/bat templates
jacobperron Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions ament_java_resources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,12 @@ find_package(ament_cmake REQUIRED)

ament_index_register_resource(
"templates"
CONTENT_FILE "classpath.sh.template"
PACKAGE_NAME "ament_build_type_gradle_classpath_sh")
CONTENT_FILE "classpath.dsv.template"
PACKAGE_NAME "ament_build_type_gradle_classpath_dsv")

ament_index_register_resource(
"templates"
CONTENT_FILE "classpath.bat.template"
PACKAGE_NAME "ament_build_type_gradle_classpath_bat")
CONTENT_FILE "jni_library_path.dsv.template"
PACKAGE_NAME "ament_build_type_gradle_jni_library_path_dsv")

ament_index_register_resource(
"templates"
CONTENT_FILE "jni_library_path.sh.template"
PACKAGE_NAME "ament_build_type_gradle_jni_library_path_sh")

ament_index_register_resource(
"templates"
CONTENT_FILE "jni_library_path.bat.template"
PACKAGE_NAME "ament_build_type_gradle_jni_library_path_bat")

ament_package()
5 changes: 0 additions & 5 deletions ament_java_resources/classpath.bat.template
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ament_java_resources/classpath.dsv.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
prepend-non-duplicate;CLASSPATH;@_AMENT_EXPORT_JARS_CLASSPATH@
27 changes: 0 additions & 27 deletions ament_java_resources/classpath.sh.template
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ament_java_resources/jni_library_path.bat.template
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ament_java_resources/jni_library_path.dsv.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
prepend-non-duplicate;@JNI_LIB_ENV_VAR@;lib/jni
Copy link
Copy Markdown
Member

@esteve esteve May 7, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jacobperron just one question, prepend-non-duplicate is supposed work for both Linux and Windows, right?

Copy link
Copy Markdown
Contributor Author

@jacobperron jacobperron May 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm pretty sure it's supposed to work for both.

14 changes: 0 additions & 14 deletions ament_java_resources/jni_library_path.sh.template
View file
Open in desktop

This file was deleted.