]>
Commit | Line | Data |
---|---|---|
46505406 JR |
1 | --- NuSMV-2.5.2/nusmv/doc/tutorial/Makefile.am~ 2010-10-29 13:15:50.000000000 +0200 |
2 | +++ NuSMV-2.5.2/nusmv/doc/tutorial/Makefile.am 2011-04-06 11:37:20.223970540 +0200 | |
3 | @@ -101,12 +101,12 @@ | |
ed57d49d | 4 | |
46505406 JR |
5 | if HAVE_PDFLATEXETAL |
6 | install-data-local: tutorial.pdf | |
7 | - $(install_sh_DATA) tutorial.pdf $(datadir)/nusmv/doc/tutorial.pdf | |
8 | + $(install_sh_DATA) tutorial.pdf $(DESTDIR)$(datadir)/nusmv/doc/tutorial.pdf | |
9 | ||
10 | else | |
11 | if HAVE_LATEX | |
12 | install-data-local: tutorial.ps | |
13 | - $(install_sh_DATA) tutorial.ps $(datadir)/nusmv/doc/tutorial.ps | |
14 | + $(install_sh_DATA) tutorial.ps $(DESTDIR)$(datadir)/nusmv/doc/tutorial.ps | |
15 | ||
16 | else | |
17 | install-data-local: | |
18 | --- NuSMV-2.5.2/nusmv/doc/user-man/Makefile.am~ 2010-10-29 13:15:50.000000000 +0200 | |
19 | +++ NuSMV-2.5.2/nusmv/doc/user-man/Makefile.am 2011-04-06 11:38:19.714970540 +0200 | |
20 | @@ -121,11 +121,11 @@ | |
21 | ||
22 | if HAVE_PDFLATEXETAL | |
23 | install-data-local: nusmv.pdf | |
24 | - $(install_sh_DATA) nusmv.pdf $(datadir)/nusmv/doc/nusmv.pdf | |
25 | + $(install_sh_DATA) nusmv.pdf $(DESTDIR)$(datadir)/nusmv/doc/nusmv.pdf | |
26 | else | |
27 | if HAVE_LATEX | |
28 | install-data-local: nusmv.ps | |
29 | - $(install_sh_DATA) nusmv.ps $(datadir)/nusmv/doc/nusmv.ps | |
30 | + $(install_sh_DATA) nusmv.ps $(DESTDIR)$(datadir)/nusmv/doc/nusmv.ps | |
31 | else | |
32 | install-data-local: | |
33 | @echo Cannot generate manual: latex not found | |
ed57d49d JR |
34 | diff -ur NuSMV-2.4.0/nusmv/helpers/extract_doc.in NuSMV-2.4.0-ok/nusmv/helpers/extract_doc.in |
35 | --- NuSMV-2.4.0/nusmv/helpers/extract_doc.in 2005-03-03 13:12:59.000000000 +0100 | |
36 | +++ NuSMV-2.4.0-ok/nusmv/helpers/extract_doc.in 2006-10-03 17:29:10.000000000 +0200 | |
37 | @@ -1,4 +1,4 @@ | |
38 | -#!/bin/sh | |
39 | +#!/bin/bash | |
40 | ||
41 | # FileName [ extract_doc.in ] | |
42 | # | |
8cbbfcb3 JR |
43 | --- NuSMV-2.4.3/cudd-2.4.1.1/Makefile.orig 2007-05-10 19:37:13.000000000 +0200 |
44 | +++ NuSMV-2.4.3/cudd-2.4.1.1/Makefile 2007-09-14 15:33:55.000000000 +0200 | |
1c91512b JR |
45 | @@ -55,7 +55,7 @@ |
46 | # These four are typical settings for optimized code with gcc. The | |
47 | # last two also work with icc/ecc. | |
48 | #ICFLAGS = -g -O6 -Wall | |
49 | -ICFLAGS = -g -O6 | |
50 | +#ICFLAGS = -g -O6 | |
51 | #ICFLAGS = -g -O3 -Wall | |
52 | #ICFLAGS = -g -O3 | |
53 | ||
54 | @@ -69,7 +69,7 @@ | |
55 | # Gcc 2.8.1 or higher on i686. | |
56 | #XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD | |
57 | # Gcc 3.2.2 or higher on i686. | |
46505406 JR |
58 | -XCFLAGS = -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -DNUSMV_SIZEOF_VOID_P=4 -DNUSMV_SIZEOF_LONG=4 -DNUSMV_SIZEOF_INT=4 |
59 | +XCFLAGS = -malign-double -DHAVE_IEEE_754 -DBSD -DNUSMV_SIZEOF_VOID_P=4 -DNUSMV_SIZEOF_LONG=4 -DNUSMV_SIZEOF_INT=4 | |
1c91512b JR |
60 | # Icc on i686. |
61 | #XCFLAGS = -ansi -align -ip -DHAVE_IEEE_754 -DBSD | |
62 | # Gcc on ia64. | |
8cbbfcb3 JR |
63 | --- NuSMV-2.4.3/cudd-2.4.1.1/Makefile_64bit~ 2007-03-14 11:31:56.000000000 +0100 |
64 | +++ NuSMV-2.4.3/cudd-2.4.1.1/Makefile_64bit 2007-09-14 15:35:25.000000000 +0200 | |
1c91512b JR |
65 | @@ -55,7 +55,7 @@ |
66 | # These four are typical settings for optimized code with gcc. The | |
67 | # last two also work with icc/ecc. | |
68 | #ICFLAGS = -g -O6 -Wall | |
69 | -ICFLAGS = -g -O6 | |
70 | +#ICFLAGS = -g -O6 | |
71 | #ICFLAGS = -g -O3 -Wall | |
72 | #ICFLAGS = -g -O3 | |
73 | ||
46505406 JR |
74 | --- NuSMV-2.5.2/nusmv/configure.ac~ 2010-10-29 13:15:51.000000000 +0200 |
75 | +++ NuSMV-2.5.2/nusmv/configure.ac 2011-04-06 11:49:45.772970540 +0200 | |
76 | @@ -4,6 +4,8 @@ | |
77 | ||
78 | AC_INIT(NuSMV, 2.5.2, nusmv-users@fbk.eu) | |
79 | ||
80 | +AC_CONFIG_MACRO_DIR([m4]) | |
81 | + | |
82 | # where to look for install.sh and other helpers | |
83 | AC_CONFIG_AUX_DIR(helpers) | |
84 | ||
46505406 JR |
85 | --- NuSMV-2.5.2/nusmv/configure.ac~ 2011-04-06 12:14:21.103822539 +0200 |
86 | +++ NuSMV-2.5.2/nusmv/configure.ac 2011-04-06 12:29:40.711202079 +0200 | |
87 | @@ -669,11 +669,11 @@ | |
88 | done | |
89 | ||
90 | dep_addons= | |
91 | -function addon_calc_dep() # calculates dependencies of given addon | |
92 | +addon_calc_dep() # calculates dependencies of given addon | |
93 | { | |
94 | addon=$1 | |
95 | __addon_deps=${addon}_deps | |
96 | - deps=${!__addon_deps} | |
97 | + eval deps=\$${__addon_deps} | |
98 | ||
99 | for dep in $deps; do | |
100 | _tmp=$(echo "$dep_addons $found_addons $alias_addons" | grep -w $dep -) # already taken? | |
101 | @@ -729,7 +729,7 @@ | |
102 | # Outputs | |
103 | for addon in $all_addons; do | |
104 | _vname=have_addon_${addon} | |
105 | - _have_addon=${!_vname} | |
106 | + eval _have_addon=\$${_vname} | |
107 | case $addon in | |
108 | compass) | |
109 | if test $_have_addon == 1; then | |
110 | --- NuSMV-2.5.2/nusmv/helpers/extract_doc.in~ 2011-04-06 12:42:33.778202079 +0200 | |
111 | +++ NuSMV-2.5.2/nusmv/helpers/extract_doc.in 2011-04-06 12:47:12.111202081 +0200 | |
112 | @@ -126,7 +126,7 @@ | |
113 | ||
114 | ||
115 | ||
116 | -function extractcommand() { | |
117 | +extractcommand() { | |
118 | cfile=$1 | |
119 | htmldir=$2 | |
120 | ||
17427a19 AM |
121 | --- NuSMV-2.5.4/MiniSat/minisat/simp/SimpSolver.C~ 2015-12-12 22:07:12.000000000 +0100 |
122 | +++ NuSMV-2.5.4/MiniSat/minisat/simp/SimpSolver.C 2015-12-12 22:09:59.149163015 +0100 | |
123 | @@ -37,7 +37,7 @@ SimpSolver::SimpSolver() : | |
124 | , bwdsub_assigns (0) | |
125 | { | |
126 | vec<Lit> dummy(1,lit_Undef); | |
127 | - bwdsub_tmpunit = Clause_new(dummy); | |
128 | + bwdsub_tmpunit = Clause::Clause_new(dummy); | |
129 | remove_satisfied = false; | |
130 | } | |
131 | ||
132 | --- NuSMV-2.5.4/MiniSat/minisat/core/SolverTypes.h~ 2006-11-10 22:54:30.000000000 +0100 | |
133 | +++ NuSMV-2.5.4/MiniSat/minisat/core/SolverTypes.h 2015-12-12 22:14:08.982282692 +0100 | |
134 | @@ -119,7 +119,7 @@ public: | |
135 | ||
136 | // -- use this function instead: | |
137 | template<class V> | |
138 | - friend Clause* Clause_new(const V& ps, bool learnt = false) { | |
139 | + static Clause* Clause_new(const V& ps, bool learnt = false) { | |
140 | assert(sizeof(Lit) == sizeof(uint32_t)); | |
141 | assert(sizeof(float) == sizeof(uint32_t)); | |
142 | void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); | |
143 | --- NuSMV-2.5.4/MiniSat/minisat/simp/SimpSolver.C~ 2015-12-12 22:14:47.000000000 +0100 | |
144 | +++ NuSMV-2.5.4/MiniSat/minisat/simp/SimpSolver.C 2015-12-12 22:16:31.295964939 +0100 | |
145 | @@ -489,7 +489,7 @@ bool SimpSolver::eliminateVar(Var v, boo | |
146 | elimtable[v].order = elimorder++; | |
147 | assert(elimtable[v].eliminated.size() == 0); | |
148 | for (int i = 0; i < cls.size(); i++){ | |
149 | - elimtable[v].eliminated.push(Clause_new(*cls[i])); | |
150 | + elimtable[v].eliminated.push(Clause::Clause_new(*cls[i])); | |
151 | removeClause(*cls[i]); } | |
152 | ||
153 | // Produce clauses in cross product: | |
154 | --- NuSMV-2.5.4/MiniSat/minisat/core/Solver.C~ 2015-12-12 22:16:49.000000000 +0100 | |
155 | +++ NuSMV-2.5.4/MiniSat/minisat/core/Solver.C 2015-12-12 22:17:47.084605634 +0100 | |
156 | @@ -114,7 +114,7 @@ bool Solver::addClause(vec<Lit>& ps) | |
157 | uncheckedEnqueue(ps[0]); | |
158 | return ok = (propagate() == NULL); | |
159 | }else{ | |
160 | - Clause* c = Clause_new(ps, false); | |
161 | + Clause* c = Clause::Clause_new(ps, false); | |
162 | clauses.push(c); | |
163 | attachClause(*c); | |
164 | } | |
165 | @@ -598,7 +598,7 @@ lbool Solver::search(int nof_conflicts, | |
166 | if (learnt_clause.size() == 1){ | |
167 | uncheckedEnqueue(learnt_clause[0]); | |
168 | }else{ | |
169 | - Clause* c = Clause_new(learnt_clause, true); | |
170 | + Clause* c = Clause::Clause_new(learnt_clause, true); | |
171 | learnts.push(c); | |
172 | attachClause(*c); | |
173 | claBumpActivity(*c); |