Skip to content

Commit 57994dd

Browse files
author
Ernest
committed
hide travis details
1 parent 09c23b3 commit 57994dd

6 files changed

+92
-58
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ matrix:
4444
- os: linux
4545
language: cpp
4646
script:
47-
./build_cpp.sh
47+
./scripts/build_cpp.sh
4848
addons:
4949
apt:
5050
sources:

‎build_cpp.sh

-8
This file was deleted.

‎generate_dependencies.make

+56-37
Original file line numberDiff line numberDiff line change
@@ -27,69 +27,88 @@ ins = $(eval i=$(shell echo $$(($(i)+1))))
2727
# get dependencies of all files,
2828
# only contains one target:prerequisites in each file.
2929
# e.g. %.o: %.cpp other.cpp\n
30-
GENERATE-SOURCE-DEPENDENCIES = @$(foreach file,$(cpp_sources),echo printf $(i) '>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
31-
printf '${i}' > $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
32-
echo $(CXX) -MM $(call RECOVER-NAME,$(file)) '>>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
30+
31+
# generate dependencies
32+
# detail
33+
# GENERATE-SOURCE-DEPENDENCIES = @$(foreach file,$(cpp_sources),echo printf $(i) '>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
34+
# printf '${i}' > $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
35+
# echo $(CXX) -MM $(call RECOVER-NAME,$(file)) '>>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
36+
# $(CXX) -MM $(call RECOVER-NAME,$(file)) >> $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
37+
# echo "cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)))";\
38+
# cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
39+
# printf $(i)$(notdir $(call RECOVER-NAME2,$(subst .cpp,.o,$(file))))" " >> dependencies_list;\
40+
# echo $(call ins);\
41+
# echo "";)
42+
43+
# brief
44+
GENERATE-SOURCE-DEPENDENCIES = @$(foreach file,$(cpp_sources),printf '${i}' > $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
3345
$(CXX) -MM $(call RECOVER-NAME,$(file)) >> $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
34-
echo "cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)))";\
35-
cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
3646
printf $(i)$(notdir $(call RECOVER-NAME2,$(subst .cpp,.o,$(file))))" " >> dependencies_list;\
37-
echo $(call ins);\
38-
echo "";)
39-
GENERATE-TEST-DEPENDENCIES = @$(foreach file,$(cpp_tests),echo printf $(i) '>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
40-
printf '${i}' > $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
41-
echo $(CXX) -MM $(call RECOVER-NAME,$(file)) '>>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
47+
$(call ins))
48+
49+
50+
# append gcc script
51+
# detail
52+
# GENERATE-TEST-DEPENDENCIES = @$(foreach file,$(cpp_tests),echo printf $(i) '>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
53+
# printf '${i}' > $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
54+
# echo $(CXX) -MM $(call RECOVER-NAME,$(file)) '>>' $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
55+
# $(CXX) -MM $(call RECOVER-NAME,$(file)) >> $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
56+
# echo "cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)))";\
57+
# cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
58+
# printf $(i)$(notdir $(call RECOVER-NAME2,$(subst .cpp,.o,$(file))))" " >> dependencies_list;\
59+
# echo $(call ins);\
60+
# echo "";)
61+
62+
# brief
63+
GENERATE-TEST-DEPENDENCIES = @$(foreach file,$(cpp_tests),printf '${i}' > $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
4264
$(CXX) -MM $(call RECOVER-NAME,$(file)) >> $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
43-
echo "cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)))";\
44-
cat $(call RECOVER-NAME,$(call CONVERT-CPP-TO-DEPENDENCY-NAME,$(file)));\
4565
printf $(i)$(notdir $(call RECOVER-NAME2,$(subst .cpp,.o,$(file))))" " >> dependencies_list;\
46-
echo $(call ins);\
47-
echo "";)
66+
$(call ins))
4867

4968

5069
##############################################
5170
# add target and prerequisites to dependencies
5271
##############################################
5372

5473
generate_dependency:
55-
@echo "##############################\n\
56-
\r# generate_dependency start. #\n\
57-
\r##############################"
58-
# clear list
74+
@echo "\n###############################\n\
75+
\r# generating dependencies ... #\n\
76+
\r###############################"
77+
# clear list
5978
@printf "" > dependencies_list
6079
$(call GENERATE-SOURCE-DEPENDENCIES)
6180
$(call GENERATE-TEST-DEPENDENCIES)
62-
@echo "############################\n\
63-
\r# generate_dependency end. #\n\
64-
\r############################"
6581

6682

6783
cpp_all_dependencies = $(shell find "$(COSMOS_ROOT_PATH)/code/" -name "*.d" | sed 's: :^^^^^^^^^^:g')
6884
cpp_test_dependencies = $(call FIND-CPP-TEST-DEPENDENCIES)
6985
cpp_source_dependencies = $(call FIND-CPP-SOURCE-DEPENDENCIES)
7086

71-
APPEND-SOURCE-COMMAND = @$(foreach file,$(cpp_source_dependencies),echo '$(CXX) -c $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' '>>' $(call RECOVER-NAME,$(file));\
72-
echo '\t$(CXX) -c $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' >> $(call RECOVER-NAME,$(file));\
73-
echo "cat $(call RECOVER-NAME,$(file))";\
74-
cat $(call RECOVER-NAME,$(file));\
75-
echo "";)
76-
APPEND-TEST-COMMAND = @$(foreach file,$(cpp_test_dependencies),echo '$(CXX) -o $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' '>>' $(call RECOVER-NAME,$(file));\
77-
echo '\t$(CXX) -o $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' >> $(call RECOVER-NAME,$(file));\
78-
echo "cat $(call RECOVER-NAME,$(file))";\
79-
cat $(call RECOVER-NAME,$(file));\
80-
echo "";)
87+
# detail
88+
# APPEND-SOURCE-COMMAND = @$(foreach file,$(cpp_source_dependencies),echo '$(CXX) -c $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' '>>' $(call RECOVER-NAME,$(file));\
89+
# echo '\t$(CXX) -c $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' >> $(call RECOVER-NAME,$(file));\
90+
# echo "cat $(call RECOVER-NAME,$(file))";\
91+
# cat $(call RECOVER-NAME,$(file));\
92+
# echo "";)
93+
# APPEND-TEST-COMMAND = @$(foreach file,$(cpp_test_dependencies),echo '$(CXX) -o $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' '>>' $(call RECOVER-NAME,$(file));\
94+
# echo '\t$(CXX) -o $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' >> $(call RECOVER-NAME,$(file));\
95+
# echo "cat $(call RECOVER-NAME,$(file))";\
96+
# cat $(call RECOVER-NAME,$(file));\
97+
# echo "";)
98+
99+
# brief
100+
APPEND-SOURCE-COMMAND = @$(foreach file,$(cpp_source_dependencies),echo '\t$(CXX) -c $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' >> $(call RECOVER-NAME,$(file));)
101+
APPEND-TEST-COMMAND = @$(foreach file,$(cpp_test_dependencies),echo '\t$(CXX) -o $(G++FLAGS) $(call RECOVER-NAME,$(call CONVERT-DEPENDENCY-TO-CPP-NAME,$(file)))' >> $(call RECOVER-NAME,$(file));)
81102

82103

83104
############################
84105
# add command to dependencies
85106
############################
86107

87108
append_command:
88-
@echo "#########################\n\
89-
\r# append_command start. #\n\
90-
\r#########################"
109+
@echo "\n##################################\n\
110+
\r# generating_compile command ... #\n\
111+
\r##################################"
91112
$(call APPEND-SOURCE-COMMAND)
92113
$(call APPEND-TEST-COMMAND)
93-
@echo "########################\n\
94-
\r# append_command done. #\n\
95-
\r########################"
114+

‎scripts/build_cpp.sh

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
cwd=$(pwd)
2+
cosmos_root_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )/.."
3+
4+
cd "$cosmos_root_path"
5+
echo ""
6+
echo "###############################"
7+
echo "# generating dependencies ... #"
8+
echo "###############################"
9+
make -f generate_dependencies.make
10+
11+
echo ""
12+
echo "#########################"
13+
echo "# compiling sources ... #"
14+
echo "#########################"
15+
make -f testing.make
16+
17+
cd "$cosmos_root_path/scripts"
18+
echo ""
19+
echo "#############################"
20+
echo "# checking coding style ... #"
21+
echo "#############################"
22+
./cpp_coding_style_checker.sh || exit 1
23+
24+
cd $cwd

‎scripts/cpp_coding_style_checker.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cwd=$(pwd)
22
cosmos_root_path="$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )/.."
33

44
error_times=0
5+
tmp=`mktemp tmp.XXXXXXXXXX`
56

67
uncrustify_root_path="$cosmos_root_path/third_party/uncrustify"
78
uncrustify="$uncrustify_root_path/build/uncrustify"
@@ -14,8 +15,8 @@ echo "###########################"
1415
rm -rf $uncrustify_root_path/build
1516
mkdir $uncrustify_root_path/build
1617
cd $uncrustify_root_path/build
17-
cmake ..
18-
cmake --build .
18+
cmake .. > $tmp
19+
cmake --build . > $tmp
1920

2021
cd "$cosmos_root_path/code"
2122

@@ -26,11 +27,9 @@ echo "###############################"
2627
for cpp_file in `find -name '*.cpp'`
2728
do
2829
# remove the output file if existed to prevent `uncrustify` is not override it
29-
if [ -f "$cpp_file.uncrustify" ]; then
30-
rm -f $cpp_file.uncrustify
31-
fi;
30+
rm -f $cpp_file.uncrustify
3231

33-
$uncrustify -c $uncrustify_config_path $cpp_file
32+
$uncrustify -q -c $uncrustify_config_path $cpp_file
3433
done
3534

3635
echo

‎testing.make

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
G++FLAGS = -Wall
44

5-
###########################
6-
# add prerequisites
7-
###########################
5+
#####################
6+
# add prerequisites #
7+
#####################
88

99
# TODO we could save testing time on reduce *.d files.
1010
files_o = $(shell cat dependencies_list)
1111
all: $(files_o);
1212

13-
###########################
14-
# include dependent targets
15-
###########################
13+
#############################
14+
# include dependent targets #
15+
#############################
1616

1717
COSMOS_ROOT_PATH := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
1818
dependencies = $(shell find "$(COSMOS_ROOT_PATH)/code/" -name "*.d" | sed 's: :\\ :g')

0 commit comments

Comments
 (0)