Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ROS Java Build Tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CeTI
ROS
ROS Java Packages
ROS Java Build Tools
Commits
a999ed2b
Commit
a999ed2b
authored
11 years ago
by
Daniel Stonier
Browse files
Options
Downloads
Patches
Plain Diff
android script fixes
parent
c505f4db
No related branches found
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/catkin_create_android_pkg
+1
-1
1 addition, 1 deletion
scripts/catkin_create_android_pkg
src/rosjava_build_tools/create_android_project.py
+7
-4
7 additions, 4 deletions
src/rosjava_build_tools/create_android_project.py
with
8 additions
and
5 deletions
scripts/catkin_create_android_pkg
+
1
−
1
View file @
a999ed2b
...
@@ -11,7 +11,7 @@ import argparse
...
@@ -11,7 +11,7 @@ import argparse
import
os
import
os
import
sys
import
sys
from
rosjava_build_tools
import
init_android_
repo
from
rosjava_build_tools
import
init_android_
package
import
rosjava_build_tools.console
as
console
import
rosjava_build_tools.console
as
console
##############################################################################
##############################################################################
...
...
This diff is collapsed.
Click to expand it.
src/rosjava_build_tools/create_android_project.py
+
7
−
4
View file @
a999ed2b
...
@@ -50,7 +50,7 @@ def parse_arguments():
...
@@ -50,7 +50,7 @@ def parse_arguments():
return
args
return
args
def
create_android_project
(
package_name
,
sdk_version
,
java_package_name
,
is_library
):
def
actually_
create_android_project
(
package_name
,
sdk_version
,
java_package_name
,
is_library
):
path
=
os
.
path
.
join
(
os
.
getcwd
(),
package_name
.
lower
())
path
=
os
.
path
.
join
(
os
.
getcwd
(),
package_name
.
lower
())
console
.
pretty_println
(
"
\n
Creating android project
"
,
console
.
bold
)
console
.
pretty_println
(
"
\n
Creating android project
"
,
console
.
bold
)
console
.
pretty_print
(
"
Name :
"
,
console
.
cyan
)
console
.
pretty_print
(
"
Name :
"
,
console
.
cyan
)
...
@@ -110,8 +110,8 @@ def create_gradle_package_files(args, author, is_library, sdk_version):
...
@@ -110,8 +110,8 @@ def create_gradle_package_files(args, author, is_library, sdk_version):
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
,
author
,
plugin_name
,
sdk_version
)
contents
=
instantiate_template
(
template
,
package_name
,
author
,
plugin_name
,
sdk_version
)
if
is_library
:
#
if is_library:
contents
+=
extra_gradle_library_text
()
#
contents += extra_gradle_library_text()
try
:
try
:
f
=
open
(
filename
,
'
w
'
)
f
=
open
(
filename
,
'
w
'
)
f
.
write
(
contents
)
f
.
write
(
contents
)
...
@@ -142,6 +142,9 @@ def add_to_root_gradle_settings(name):
...
@@ -142,6 +142,9 @@ def add_to_root_gradle_settings(name):
def
extra_gradle_library_text
():
def
extra_gradle_library_text
():
'''
Not actually necessary until we start using maven-publish plugin. It doesn
'
t handle dependencies right now.
'''
text
=
"
\n
"
text
=
"
\n
"
text
+=
"
/* http://www.flexlabs.org/2013/06/using-local-aar-android-library-packages-in-gradle-builds */
\n
"
text
+=
"
/* http://www.flexlabs.org/2013/06/using-local-aar-android-library-packages-in-gradle-builds */
\n
"
text
+=
"
android.libraryVariants
\n
"
text
+=
"
android.libraryVariants
\n
"
...
@@ -158,7 +161,7 @@ def extra_gradle_library_text():
...
@@ -158,7 +161,7 @@ def extra_gradle_library_text():
def
create_android_project
(
is_library
=
False
):
def
create_android_project
(
is_library
=
False
):
args
=
parse_arguments
()
args
=
parse_arguments
()
create_android_project
(
args
.
name
[
0
],
args
.
sdk_version
,
args
.
android_package_name
,
is_library
)
actually_
create_android_project
(
args
.
name
[
0
],
args
.
sdk_version
,
args
.
android_package_name
,
is_library
)
create_gradle_package_files
(
args
,
args
.
author
,
is_library
,
args
.
sdk_version
)
create_gradle_package_files
(
args
,
args
.
author
,
is_library
,
args
.
sdk_version
)
add_to_root_gradle_settings
(
args
.
name
[
0
])
add_to_root_gradle_settings
(
args
.
name
[
0
])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment