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
84278e73
Commit
84278e73
authored
11 years ago
by
Daniel Stonier
Browse files
Options
Downloads
Patches
Plain Diff
target-sdk version bugfixing for catkin create projects.
parent
9a1a6e9d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/rosjava_build_tools/create_android_project.py
+13
-10
13 additions, 10 deletions
src/rosjava_build_tools/create_android_project.py
src/rosjava_build_tools/templates/android_project/build.gradle.in
+7
-2
7 additions, 2 deletions
...ava_build_tools/templates/android_project/build.gradle.in
with
20 additions
and
12 deletions
src/rosjava_build_tools/create_android_project.py
+
13
−
10
View file @
84278e73
...
@@ -28,10 +28,10 @@ def parse_arguments():
...
@@ -28,10 +28,10 @@ def parse_arguments():
parser
.
add_argument
(
'
name
'
,
parser
.
add_argument
(
'
name
'
,
nargs
=
1
,
nargs
=
1
,
help
=
'
The name for the package
'
)
help
=
'
The name for the package
'
)
parser
.
add_argument
(
'
-
s
'
,
'
--
sdk
-version
'
,
parser
.
add_argument
(
'
-
t
'
,
'
--
target
-version
'
,
action
=
'
store
'
,
action
=
'
store
'
,
default
=
'
1
8.1.1
'
,
default
=
'
1
5
'
,
help
=
'
A
ndroid
sdk
version [1
8.1.1
]
'
)
help
=
'
Target a
ndroid version [1
5
]
'
)
parser
.
add_argument
(
'
-p
'
,
'
--android-package-name
'
,
parser
.
add_argument
(
'
-p
'
,
'
--android-package-name
'
,
action
=
'
store
'
,
action
=
'
store
'
,
default
=
'
com.github.rosjava.android.pkg_name
'
,
default
=
'
com.github.rosjava.android.pkg_name
'
,
...
@@ -46,27 +46,30 @@ def parse_arguments():
...
@@ -46,27 +46,30 @@ def parse_arguments():
return
args
return
args
def
actually_create_android_project
(
package_name
,
sdk
_version
,
java_package_name
,
is_library
):
def
actually_create_android_project
(
package_name
,
target
_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
)
console
.
pretty_println
(
"
%s
"
%
package_name
,
console
.
yellow
)
console
.
pretty_println
(
"
%s
"
%
package_name
,
console
.
yellow
)
console
.
pretty_print
(
"
Sdk
Ver
:
"
,
console
.
cyan
)
console
.
pretty_print
(
"
Target
Ver:
"
,
console
.
cyan
)
console
.
pretty_println
(
"
%s
"
%
sdk
_version
,
console
.
yellow
)
console
.
pretty_println
(
"
%s
"
%
target
_version
,
console
.
yellow
)
console
.
pretty_print
(
"
Java Name :
"
,
console
.
cyan
)
console
.
pretty_print
(
"
Java Name :
"
,
console
.
cyan
)
console
.
pretty_println
(
"
%s
"
%
java_package_name
,
console
.
yellow
)
console
.
pretty_println
(
"
%s
"
%
java_package_name
,
console
.
yellow
)
if
is_library
:
if
is_library
:
console
.
pretty_print
(
"
Library :
"
,
console
.
cyan
)
console
.
pretty_print
(
"
Library :
"
,
console
.
cyan
)
console
.
pretty_println
(
"
yes
\n
"
,
console
.
yellow
)
console
.
pretty_println
(
"
yes
\n
"
,
console
.
yellow
)
cmd
=
[
'
android
'
,
'
create
'
,
'
lib-project
'
,
'
-n
'
,
package_name
,
'
-p
'
,
path
,
'
-k
'
,
java_package_name
,
'
-t
'
,
'
android-
'
+
sdk
_version
,
]
cmd
=
[
'
android
'
,
'
create
'
,
'
lib-project
'
,
'
-n
'
,
package_name
,
'
-p
'
,
path
,
'
-k
'
,
java_package_name
,
'
-t
'
,
'
android-
'
+
target
_version
,
]
else
:
else
:
activity_name
=
utils
.
camel_case
(
package_name
)
activity_name
=
utils
.
camel_case
(
package_name
)
console
.
pretty_print
(
"
Activity :
"
,
console
.
cyan
)
console
.
pretty_print
(
"
Activity :
"
,
console
.
cyan
)
console
.
pretty_println
(
"
%s
\n
"
%
activity_name
,
console
.
yellow
)
console
.
pretty_println
(
"
%s
\n
"
%
activity_name
,
console
.
yellow
)
cmd
=
[
'
android
'
,
'
create
'
,
'
project
'
,
'
-n
'
,
package_name
,
'
-p
'
,
path
,
'
-k
'
,
java_package_name
,
'
-t
'
,
'
android-
'
+
sdk_version
,
'
-a
'
,
activity_name
]
cmd
=
[
'
android
'
,
'
create
'
,
'
project
'
,
'
-n
'
,
package_name
,
'
-p
'
,
path
,
'
-k
'
,
java_package_name
,
'
-t
'
,
'
android-
'
+
target_version
,
'
-a
'
,
activity_name
]
print
(
"
Command: %s
"
%
cmd
)
try
:
try
:
subprocess
.
check_call
(
cmd
)
subprocess
.
check_call
(
cmd
)
print
(
"
Command: %s
"
%
cmd
)
except
subprocess
.
CalledProcessError
:
except
subprocess
.
CalledProcessError
:
print
(
"
Error
"
)
raise
subprocess
.
CalledProcessError
(
"
failed to create android project.
"
)
raise
subprocess
.
CalledProcessError
(
"
failed to create android project.
"
)
# This is in the old form, let's shovel the shit around to the new form
# This is in the old form, let's shovel the shit around to the new form
utils
.
mkdir_p
(
os
.
path
.
join
(
path
,
'
src
'
,
'
main
'
,
'
java
'
))
utils
.
mkdir_p
(
os
.
path
.
join
(
path
,
'
src
'
,
'
main
'
,
'
java
'
))
...
@@ -157,8 +160,8 @@ def extra_gradle_library_text():
...
@@ -157,8 +160,8 @@ 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
()
actually_create_android_project
(
args
.
name
[
0
],
args
.
sdk
_version
,
args
.
android_package_name
,
is_library
)
actually_create_android_project
(
args
.
name
[
0
],
args
.
target
_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
.
target
_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.
src/rosjava_build_tools/templates/android_project/build.gradle.in
+
7
−
2
View file @
84278e73
...
@@ -34,6 +34,11 @@ dependencies {
...
@@ -34,6 +34,11 @@ dependencies {
apply plugin: '%(plugin_name)s'
apply plugin: '%(plugin_name)s'
android {
android {
packagingOptions {
/* https://github.com/rosjava/android_core/issues/194 */
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
}
compileSdkVersion %(sdk_version)s
compileSdkVersion %(sdk_version)s
}
}
\ No newline at end of file
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