From fa061f300ba242a7ec664ac9b9cc7292e54d9b8a Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 10 Feb 2015 05:39:27 +0200 Subject: [PATCH] build in: - build in android-studio (ubuntu and windows) - catkin_make - gradlew update maven url at allprojects {} update .gitignore: - ignore build - ignore .idea - ignore .gradle - ignore *iml - ignore local.properties --- .gitignore | 2 -- CMakeLists.txt | 2 +- build.gradle | 6 ++++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 69ff650..eb16f49 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ bin gen -libs build.xml local.properties proguard-project.txt @@ -12,5 +11,4 @@ build *.iml build.log build-log.xml -docs.iml *~ diff --git a/CMakeLists.txt b/CMakeLists.txt index 10cbd86..1a1ee67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,5 +11,5 @@ catkin_package() # Installation ############################################################################## -install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/rosjava/android_apps/ +install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/rosjava/android_apps/ DESTINATION ${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/rosjava/android_apps) diff --git a/build.gradle b/build.gradle index 0f4dc15..1c5e661 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { repositories { maven { - url "http://www.github.com/talregev/rosjava_mvn_repo/raw/master" + url "https://github.com/talregev/rosjava_mvn_repo/raw/master" } } @@ -42,4 +42,6 @@ allprojects { subprojects { apply plugin: 'ros-android' -} \ No newline at end of file +} + +defaultTasks 'assembleRelease', 'uploadArchives' \ No newline at end of file