File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change 13
13
function launch {
14
14
# apply update
15
15
if [ " $( git rev-parse HEAD) " != " $( git rev-parse @{u}) " ]; then
16
- git reset --hard @{u} &&
17
- git clean -xdf &&
18
- exec " ${BASH_SOURCE[0]} "
16
+ git reset --hard @{u} &&
17
+ git clean -xdf &&
18
+
19
+ # Touch all files on release2 after checkout to prevent rebuild
20
+ BRANCH=$( git rev-parse --abbrev-ref HEAD)
21
+ if [[ " $BRANCH " == " release2" ]]; then
22
+ touch **
23
+ fi
24
+
25
+ exec " ${BASH_SOURCE[0]} "
19
26
fi
20
27
21
28
# no cpu rationing for now
Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ OBJDIR = obj
38
38
39
39
OPENDBC_PATH := $(shell python2 -c 'import opendbc; print opendbc.DBC_PATH')
40
40
41
- DBC_SOURCES := $(wildcard $(OPENDBC_PATH ) /* .dbc)
41
+ DBC_SOURCES := $(sort $( wildcard $(OPENDBC_PATH ) /* .dbc) )
42
42
DBC_OBJS := $(patsubst $(OPENDBC_PATH ) /% .dbc,$(OBJDIR ) /% .o,$(DBC_SOURCES ) )
43
43
DBC_CCS := $(patsubst $(OPENDBC_PATH ) /% .dbc,dbc_out/% .cc,$(DBC_SOURCES ) )
44
44
.SECONDARY : $(DBC_CCS )
You can’t perform that action at this time.
0 commit comments