Skip to content

Commit ab1fb3b

Browse files
gpdowninggpdowning
committed
another commit
1 parent da95f11 commit ab1fb3b

File tree

10 files changed

+2577
-140
lines changed

10 files changed

+2577
-140
lines changed

‎.travis.yml

+3-29
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,20 @@ before_install:
77
- sudo apt-get update
88

99
install:
10-
- uname -a
1110
- sudo apt-get install clang-3.4
1211
- sudo apt-get install g++-4.8
13-
- sudo apt-get install libboost-all-dev
14-
- sudo apt-get install doxygen
1512
- sudo apt-get install libgtest-dev
1613
- cd /usr/src/gtest
1714
- sudo cmake .
1815
- sudo make
1916
- sudo mv libg* /usr/local/lib/
2017
- cd -
18+
- sudo apt-get install libboost-all-dev
2119
- sudo apt-get install valgrind
20+
- sudo apt-get install doxygen
2221

2322
before_script:
24-
- ls -al /usr/bin/*clang*
25-
- clang++ -v
26-
- ls -al /usr/bin/*g++*
27-
- g++ -v
28-
- g++-4.8 -v
29-
- ls -al /usr/bin/*cov*
30-
- gcov -v
31-
- gcov-4.6 -v
32-
- gcov-4.8 -v
33-
- cat /usr/include/boost/version.hpp
34-
- doxygen --version
35-
- ls -al /usr/local/lib/*gtest*
36-
- valgrind --version
23+
- make versions
3724

3825
script:
39-
- cd examples
4026
- make test
41-
- make clean
42-
- make test CXX=clang++
43-
- cd -
44-
- cd projects/collatz
45-
- make collatz-tests
46-
- make Collatz.log
47-
- make html
48-
- make test
49-
- make clean
50-
- make test CXX=clang++
51-
- make check
52-
- cd -

‎examples/Coverage1.c++

+9
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ Running main() from gtest_main.cc
3434
3535
3636
37+
% gcov -version
38+
gcov (Ubuntu 4.8.2-19ubuntu1) 4.8.2
39+
Copyright (C) 2013 Free Software Foundation, Inc.
40+
This is free software; see the source for copying conditions.
41+
There is NO warranty; not even for MERCHANTABILITY or
42+
FITNESS FOR A PARTICULAR PURPOSE.
43+
44+
45+
3746
% gcov -b Coverage1.c++ | grep -A 5 "File 'Coverage1.c++'"
3847
File 'Coverage1.c++'
3948
Lines executed:63.64% of 11

‎examples/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ sync:
5151
--include "*.h" \
5252
--include "makefile" \
5353
--exclude "*" \
54-
. downing@$(CS):cs/cs378/c++/examples/
54+
. downing@$(CS):cs/cs378/github/c++/examples/
5555

5656
test: $(FILES:=.c++.gcov)

‎exercises/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ sync:
4646
--include "*.h" \
4747
--include "makefile" \
4848
--exclude "*" \
49-
. downing@$(CS):cs/cs378/c++/exercises/
49+
. downing@$(CS):cs/cs378/github/c++/exercises/
5050

5151
test: $(FILES:=.c++.gcov)

‎makefile

+75-91
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
1+
ifeq ($(shell uname), Darwin)
2+
CXX := g++
3+
GTEST := head -1 /usr/local/src/gtest-1.7.0/CHANGES
4+
GCOV := gcov
5+
BOOST := /usr/local/src/boost_1_57_0/boost
6+
VALGRIND1 :=
7+
VALGRIND2 :=
8+
else ifeq ($(CXX), clang++)
9+
GTEST := dpkg -l libgtest-dev
10+
GCOV := gcov-4.6
11+
BOOST := /usr/include/boost
12+
VALGRIND1 := which valgrind
13+
VALGRIND2 := valgrind --version
14+
else
15+
CXX := g++-4.8
16+
GTEST := dpkg -l libgtest-dev
17+
GCOV := gcov-4.8
18+
BOOST := /usr/include/boost
19+
VALGRIND1 := which valgrind
20+
VALGRIND2 := valgrind --version
21+
endif
22+
123
clean:
2-
cd examples; make clean
24+
cd examples; make --no-print-directory clean
325
@echo
4-
cd exercises; make clean
26+
cd exercises; make --no-print-directory clean
527
@echo
6-
cd projects/collatz; make clean
28+
cd projects/collatz; make --no-print-directory clean
729
@echo
8-
cd quizzes; make clean
30+
cd quizzes; make --no-print-directory clean
931

1032
config:
1133
git config -l
@@ -39,6 +61,7 @@ pull:
3961
--include "Collatz.h" \
4062
--include "gitignore.sample" \
4163
--include "makefile" \
64+
--include "makefile.sample" \
4265
--include "RunCollatz.c++" \
4366
--include "RunCollatz.in" \
4467
--include "RunCollatz.sample.out" \
@@ -48,92 +71,6 @@ pull:
4871
--exclude "*" \
4972
../../../projects/c++/ projects
5073

51-
# @rsync -r -t -u -v --delete \
52-
# --include "voting/" \
53-
# --include "makefile" \
54-
# --exclude "*" \
55-
# ../../projects/c++/ projects
56-
#
57-
# @rsync -r -t -u -v --delete \
58-
# --include "integer/" \
59-
# --include "*.c++" \
60-
# --include "*.h" \
61-
# --include "*.out" \
62-
# --include "makefile" \
63-
# --exclude "*" \
64-
# ../../projects/c++/ projects
65-
#
66-
# @rsync -r -t -u -v --delete \
67-
# --include "deque/" \
68-
# --include "*.c++" \
69-
# --include "*.h" \
70-
# --include "*.out" \
71-
# --include "makefile" \
72-
# --exclude "*" \
73-
# ../../projects/c++/ projects
74-
#
75-
# @rsync -r -t -u -v --delete \
76-
# --include "graph/" \
77-
# --include "*.c++" \
78-
# --include "*.h" \
79-
# --include "*.out" \
80-
# --include "makefile" \
81-
# --exclude "*" \
82-
# ../../projects/c++/ projects
83-
#
84-
# --include "Exceptions.c++" \
85-
# --include "Exceptions2.c++" \
86-
# --include "Exceptions3.c++" \
87-
# --include "Types.c++" \
88-
# --include "Operators.c++" \
89-
# --include "StackVsHeap.c++" \
90-
# --include "Valgrind.c++" \
91-
# --include "Selection.c++" \
92-
# --include "Iteration.c++" \
93-
# --include "Factorial.c++" \
94-
# --include "Variables.c++" \
95-
# --include "Arguments.c++" \
96-
# --include "Returns.c++" \
97-
# --include "CommandLine.c++" \
98-
# --include "Consts.c++" \
99-
# --include "FunctionDefaults.c++" \
100-
# --include "FunctionOverloading.c++" \
101-
# --include "FunctionGenerics.c++" \
102-
# --include "FunctionSpecializations.c++" \
103-
# --include "Pow.c++" \
104-
# --include "Distance.c++" \
105-
# --include "Vector.c++" \
106-
# --include "Vectors.c++" \
107-
# --include "Memory.h" \
108-
# --include "Vector.h" \
109-
# --include "Sequences.c++" \
110-
# --include "Stacks.c++" \
111-
# --include "Queues.c++" \
112-
# --include "Functions.c++" \
113-
# --include "PriorityQueues.c++" \
114-
# --include "PriorityQueue.h" \
115-
# --include "Sets.c++" \
116-
# --include "Maps.c++" \
117-
# --include "BackInserter.c++" \
118-
# --include "OStreamIterator.c++" \
119-
# --include "IStreamIterator.c++" \
120-
# --include "ReverseIterator.c++" \
121-
# --include "ArrayObjects.c++" \
122-
# --include "ArrayObject1.h" \
123-
# --include "ArrayObject2.h" \
124-
# --include "ArrayObject3.h" \
125-
# --include "Functions2.c++" \
126-
# --include "Binder2nd.c++" \
127-
# --include "StdDev.c++" \
128-
# --include "PtrFun.c++" \
129-
# --include "MemFunRef.c++" \
130-
# --include "Endl.c++" \
131-
# --include "Setw.c++" \
132-
# --include "PtrFun.c++" \
133-
# --include "MemFunRef.c++" \
134-
# --include "Endl.c++" \
135-
# --include "Setw.c++" \
136-
13774
push:
13875
make clean
13976
@echo
@@ -163,10 +100,57 @@ sync:
163100
@rsync -r -t -u -v --delete \
164101
--include "makefile" \
165102
--exclude "*" \
166-
. downing@$(CS):cs/cs378/c++/
103+
. downing@$(CS):cs/cs378/github/c++/
167104
@echo
168105
cd examples; make sync
169106
@echo
170107
cd exercises; make sync
171108
@echo
109+
cd projects/collatz; make sync
110+
@echo
172111
cd quizzes; make sync
112+
113+
test:
114+
cd examples; \
115+
make --no-print-directory test; \
116+
make --no-print-directory clean; \
117+
make --no-print-directory test CXX=clang++
118+
@echo
119+
cd exercises; \
120+
make --no-print-directory test; \
121+
make --no-print-directory clean; \
122+
make --no-print-directory test CXX=clang++
123+
@echo
124+
cd projects/collatz; \
125+
make --no-print-directory collatz_tests; \
126+
make --no-print-directory html; \
127+
make --no-print-directory test; \
128+
make --no-print-directory clean; \
129+
make --no-print-directory test CXX=clang++; \
130+
make --no-print-directory check
131+
@echo
132+
cd quizzes; \
133+
make --no-print-directory test; \
134+
make --no-print-directory clean; \
135+
make --no-print-directory test CXX=clang++
136+
137+
versions:
138+
which $(CXX)
139+
@echo
140+
$(CXX) -v
141+
@echo
142+
$(GTEST)
143+
@echo
144+
which $(GCOV)
145+
@echo
146+
$(GCOV) -version
147+
@echo
148+
$(VALGRIND1)
149+
@echo
150+
$(VALGRIND2)
151+
@echo
152+
grep "#define BOOST_VERSION " $(BOOST)/version.hpp
153+
@echo
154+
which doxygen
155+
@echo
156+
doxygen -v

0 commit comments

Comments
 (0)