Changeset 403:46598ff03aa8 in finroc


Ignore:
Timestamp:
19.10.2018 11:31:40 (8 weeks ago)
Author:
Tobias Föhst <foehst@…>
Branch:
17.03
Parents:
400:a28ec29f464f (diff), 401:3da23436afdd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Tags:
tip
Amend:
61626232653535313233373436623931363565383432376662363834343566323733356166326336
Message:

Merge with 14.08

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r358 r402  
    2222 
    2323MAKEFILE=Makefile.generated 
     24LIBDB=make_builder/etc/libdb.$$FINROC_TARGET 
    2425DIRECT_BUILD_PREFIX=build- 
    2526 
     
    2930        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; SYSTEM_ROOT=$$FINROC_CROSS_ROOT make_builder/scripts/updatelibdb $$FINROC_TARGET' 
    3031 
    31 makefile: 
    32         $(MAKE) -C make_builder dist/build.jar 
    33         @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv 2> /dev/null ; [ -f make_builder/etc/libdb.$$FINROC_TARGET ] || $(MAKE) libdb' 
     32makefile: $(LIBDB) 
     33        $(MAKE) -C make_builder 
    3434        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; java -jar make_builder/dist/build.jar makebuilder.ext.finroc.FinrocBuilder --build=$$FINROC_TARGET $$FINROC_MAKE_BUILDER_FLAGS --makefile=$(MAKEFILE)' 
    3535 
    3636build: $(MAKEFILE) 
    37         @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv  2> /dev/null ; $(MAKE) --no-print-directory -f $(MAKEFILE) pre-build-hook' 
     37        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; $(MAKE) --no-print-directory -f $(MAKEFILE) pre-build-hook' 
    3838        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; $(MAKE) --no-print-directory -f $(MAKEFILE) $(WHAT)' 
    39         @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv  2> /dev/null ; $(MAKE) --no-print-directory -f $(MAKEFILE) post-build-hook' 
     39        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; $(MAKE) --no-print-directory -f $(MAKEFILE) post-build-hook' 
    4040 
    4141dependency_graph: 
    42         $(MAKE) -C make_builder dist/build.jar 
     42        $(MAKE) -C make_builder 
    4343        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; java -jar make_builder/dist/build.jar makebuilder.ext.finroc.FinrocBuilder --build=$$FINROC_TARGET $$FINROC_MAKE_BUILDER_FLAGS --dotfile' 
     44 
     45$(LIBDB): 
     46        $(MAKE) libdb 
    4447 
    4548$(MAKEFILE): 
     
    5255        @bash -c '[ "$(if $(findstring $(DIRECT_BUILD_PREFIX), $*),yes)" == "yes" ] || rm -f $(MAKEFILE)' 
    5356        @$(MAKE) --no-print-directory build WHAT=$(subst $(DIRECT_BUILD_PREFIX),,$*) 
    54  
  • Makefile

    r401 r402  
    2222 
    2323MAKEFILE=Makefile.generated 
    24 LIBDB=make_builder/etc/libdb.txt 
     24LIBDB=make_builder/etc/libdb.$$FINROC_TARGET 
    2525DIRECT_BUILD_PREFIX=build- 
    2626 
     
    2828 
    2929libdb: 
    30         @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; updatelibdb' 
     30        @bash -c '[ -z "$$FINROC_HOME" ] && source scripts/setenv ; SYSTEM_ROOT=$$FINROC_CROSS_ROOT make_builder/scripts/updatelibdb $$FINROC_TARGET' 
    3131 
    3232makefile: $(LIBDB) 
     
    5555        @bash -c '[ "$(if $(findstring $(DIRECT_BUILD_PREFIX), $*),yes)" == "yes" ] || rm -f $(MAKEFILE)' 
    5656        @$(MAKE) --no-print-directory build WHAT=$(subst $(DIRECT_BUILD_PREFIX),,$*) 
    57  
Note: See TracChangeset for help on using the changeset viewer.