Applying all patches inside patches directory #79
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
|
|
||
| if(ANDROID_NDK_TOOLCHAIN_INCLUDED) | ||
| return() | ||
| endif(ANDROID_NDK_TOOLCHAIN_INCLUDED) | ||
| include($ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake) | ||
|
|
||
| # Debug and release flags. | ||
| list(REMOVE_ITEM ANDROID_COMPILER_FLAGS -g) | ||
| list(APPEND ANDROID_COMPILER_FLAGS_DEBUG -g) | ||
| list(APPEND ANDROID_COMPILER_FLAGS_RELWITHDEBINFO -g ${ANDROID_COMPILER_FLAGS_RELEASE}) | ||
|
|
||
| if(ANDROID_TOOLCHAIN STREQUAL clang) | ||
| list(APPEND ANDROID_COMPILER_FLAGS_RELWITHDEBINFO -fno-limit-debug-info) | ||
| endif() | ||
|
|
||
| # Toolchain ABI specific flags. | ||
| string(REPLACE ";" " " ANDROID_COMPILER_FLAGS_RELWITHDEBINFO "${ANDROID_COMPILER_FLAGS_RELWITHDEBINFO}") | ||
| set(CMAKE_C_FLAGS_RELWITHDEBINFO "" | ||
| CACHE STRING "Flags used by the compiler during relwithdebinfo builds.") | ||
| set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "" | ||
| CACHE STRING "Flags used by the compiler during relwithdebinfo builds.") | ||
| set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "" | ||
| CACHE STRING "Flags used by the compiler during relwithdebinfo builds.") | ||
|
|
||
| set(CMAKE_C_FLAGS_RELWITHDEBINFO "${ANDROID_COMPILER_FLAGS_RELWITHDEBINFO} ${CMAKE_C_FLAGS_RELWITHDEBINFO}") | ||
| set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${ANDROID_COMPILER_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") | ||
| set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "${ANDROID_COMPILER_FLAGS_RELWITHDEBINFO} ${CMAKE_ASM_FLAGS_RELWITHDEBINFO}") | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Abort script on any failures | ||
| set -e | ||
|
|
||
| my_loc="$(cd "$(dirname $0)" && pwd)" | ||
| source $my_loc/config.sh | ||
| source $my_loc/utils.sh | ||
|
|
||
| if [ $# != 2 ] || [ $1 == '-h' ] || [ $1 == '--help' ]; then | ||
| echo "Usage: $0 patch_prefix output_prefix" | ||
| echo " example: $0 /home/user/ros_android/patches /home/user/my_workspace/output" | ||
| exit 1 | ||
| fi | ||
|
|
||
| patch_prefix=$1 | ||
| output_prefix=$2 | ||
|
|
||
| echo | ||
| echo -e '\e[34mApplying patches.\e[39m' | ||
| echo | ||
|
|
||
| for patch_file in $patch_prefix/*.patch; do | ||
| apply_patch $patch_file -d $output_prefix | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,17 +101,7 @@ mkdir -p $prefix/libs | |
| export TARGET_DIR=$prefix/target | ||
| [ -d $TARGET_DIR ] || mkdir -p $TARGET_DIR | ||
|
|
||
| export RBA_TOOLCHAIN=$my_loc/android.toolchain.cmake | ||
|
|
||
| # Get all library dependencies. | ||
| run_cmd get_system_dependencies $my_loc/system_deps.rosinstall $prefix/libs $my_loc/files | ||
|
|
@@ -123,193 +113,32 @@ echo | |
| if [[ $skip -ne 1 ]] ; then | ||
| run_cmd get_catkin_packages $prefix | ||
|
|
||
|
There was a problem hiding this comment. This special case is not handled anymore. In combination with do_everything.sh:120ff if The alternative would be to ignore package There was a problem hiding this comment. AFAIU the unpatched version won't work; my rationale is that if you don't want I agree that for correctness we should ignore There was a problem hiding this comment. Always building with pluginlib support enabled would be fine for me. |
||
| run_cmd apply_patches $my_loc/patches $prefix | ||
| fi | ||
|
|
||
| # Before build | ||
| # Search packages that depend on pluginlib and generate plugin loader. | ||
| echo | ||
| echo -e '\e[34mBuilding pluginlib support...\e[39m' | ||
| echo | ||
|
|
||
| pluginlib_helper_file=pluginlib_helper.cpp | ||
| $my_loc/files/pluginlib_helper/pluginlib_helper.py -scanroot $prefix/catkin_ws/src $user_workspace -cppout $my_loc/files/pluginlib_helper/$pluginlib_helper_file | ||
| cp $my_loc/files/pluginlib_helper/$pluginlib_helper_file $prefix/catkin_ws/src/pluginlib/src/ | ||
| line="add_library(pluginlib STATIC src/pluginlib_helper.cpp)" | ||
| # temporally turn off error detection | ||
| set +e | ||
| grep "$line" $prefix/catkin_ws/src/pluginlib/CMakeLists.txt | ||
| # if line is not already added, then add it to the pluginlib cmake | ||
| if [ $? -ne 0 ]; then | ||
| # backup the file | ||
| cp $prefix/catkin_ws/src/pluginlib/CMakeLists.txt $prefix/catkin_ws/src/pluginlib/CMakeLists.txt.bak | ||
| sed -i '/INCLUDE_DIRS include/a LIBRARIES ${PROJECT_NAME}' $prefix/catkin_ws/src/pluginlib/CMakeLists.txt | ||
| echo -e "\n"$line >> $prefix/catkin_ws/src/pluginlib/CMakeLists.txt | ||
| echo 'install(TARGETS pluginlib RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})' >> $prefix/catkin_ws/src/pluginlib/CMakeLists.txt | ||
| fi | ||
| # turn error detection back on | ||
| set -e | ||
|
|
||
| echo | ||
| echo -e '\e[34mBuilding library dependencies.\e[39m' | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not sufficient to change
ANDROID_COMPILER_FLAGS_*. The values have already been copied intoCMAKE_C_FLAGS_*,CMAKE_CXX_FLAGS_*,CMAKE_ASM_FLAGS_*further down in the included toolchain file and are not applied directly. So the replacements have to be applied to all of those variables:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the observation; I'll open a PR with the modification.