diff options
| author | Jonathan Bauer | 2013-03-19 15:02:52 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-03-19 15:02:52 +0100 |
| commit | da0084106fbd7a11fb0156bc673947a4f482b2d2 (patch) | |
| tree | 213a0643060fc1e3685cef2f4a211e8e973db1b6 /remote/setup_target | |
| parent | fix path for --help (diff) | |
| download | tm-scripts-da0084106fbd7a11fb0156bc673947a4f482b2d2.tar.gz tm-scripts-da0084106fbd7a11fb0156bc673947a4f482b2d2.tar.xz tm-scripts-da0084106fbd7a11fb0156bc673947a4f482b2d2.zip | |
copy_static_files function now called on each module
Diffstat (limited to 'remote/setup_target')
| -rwxr-xr-x | remote/setup_target | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/remote/setup_target b/remote/setup_target index c1a45787..e3273f4d 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -51,7 +51,8 @@ read_build () { . "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed." } -copyfileswithdependencies () { + +copy_files_with_deps () { [ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0 cd $MODULE_BUILD_DIR @@ -188,7 +189,6 @@ process_module() { if [ ! -z "$REQUIRED_MODULES" ]; then pinfo "$MODULE depends on ${REQUIRED_MODULES}...." for DEP in $REQUIRED_MODULES; do - #[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile." process_module "$DEP" done # Read old config again, as it got overwritten by the deps @@ -207,7 +207,9 @@ process_module() { # remove *.la files as they might confuse libtool/linker of other tool packages find "${MODULE_DIR}/build" -name '*.la' -exec rm -f {} \; pinfo "## Copying files with dependencies" - copyfileswithdependencies + copy_files_with_deps + pinfo "## Copying static module files" + copy_static_data pinfo "## Post copy" post_copy |