File tree 5 files changed +13
-2
lines changed
5 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -944,7 +944,7 @@ $(ODIR)/%.inc: $(SRC_DIR)/%.cpp
944
944
945
945
.PHONY : includes
946
946
includes : $(OBJS:.o=.inc )
947
- make -C tests includes
947
+ + make -C tests includes
948
948
949
949
$(ODIR ) /% .o : $(SRC_DIR ) /% .cpp $(PCH_P )
950
950
$(CXX ) $(CPPFLAGS ) $(DEFINES ) $(CXXFLAGS ) -MMD -MP $(PCHFLAGS ) -c $< -o $@
Original file line number Diff line number Diff line change @@ -158,12 +158,13 @@ then
158
158
tidyable_cpp_files=$all_cpp_files
159
159
else
160
160
make \
161
+ -j $num_jobs \
161
162
${COMPILER: +COMPILER=$COMPILER } \
162
163
TILES=${TILES:- 0} \
163
164
SOUND=${SOUND:- 0} \
164
165
includes
165
166
166
- ./files_changed < ./build-scripts /files_changed
167
+ ./build-scripts/ files_changed > . /files_changed
167
168
tidyable_cpp_files=" $( \
168
169
( build-scripts/get_affected_files.py ./files_changed ) || \
169
170
echo unknown ) "
Original file line number Diff line number Diff line change 102
102
tidyable_cpp_files=$all_cpp_files
103
103
else
104
104
make \
105
+ -j $num_jobs \
105
106
${COMPILER: +COMPILER=$COMPILER } \
106
107
TILES=${TILES:- 0} \
107
108
SOUND=${SOUND:- 0} \
Original file line number Diff line number Diff line change 43
43
fi
44
44
done
45
45
files_list " $( git merge-base " $base " HEAD^2 ) ..HEAD^2"
46
+ elif [ -n " $GIT_LOCAL_BASE_REF " ]
47
+ then
48
+ files_list " $GIT_LOCAL_BASE_REF ..HEAD"
46
49
else
47
50
echo ' Neither $TRAVIS nor $GITHUB_BASE_REF was defined' >&2
48
51
exit 1
Original file line number Diff line number Diff line change @@ -37,6 +37,12 @@ def parse_includes_file(
37
37
set (),
38
38
).add (source_file_path )
39
39
40
+ # A source file also 'includes' itself
41
+ self .includes_to_sources .setdefault (
42
+ source_file_path ,
43
+ set (),
44
+ ).add (source_file_path )
45
+
40
46
# Parses includes files from a given folder
41
47
# Maps include file path to a source file path by converting
42
48
# folder_path/*.inc -> file_path_prefix/*.cpp
You can’t perform that action at this time.
0 commit comments