Joachim Klein
f21aa86be8
Makefile: C++ compiler flag --std=c++11
We would like to use C++11 features in the future, so tell the compiler
to use C++11.
The lpsolve library relies on the WIN32 macro definition to detect Windows
instead of the usual _WIN32. WIN32 seems not to be defined in mingw/gcc
when standard mode is active, so we define it ourselves.
http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system#WindowsCygwinnonPOSIXandMinGW
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12010 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c38126a82e
Makefile: statically link pthread library for cygwin
In recent mingw g++ compilers from cygwin, the standard C++ library
depends on the pthreads library (libwinpthread-1.dll). As we'd like
for the prism DLLs to not depend on that library, we adapt the
linker flags to statically link the pthread library.
As we are not actually using any symbols, we also have to use the
--whole-archive flag to force linking.
https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw/43402308#43402308
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12009 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
d126a8ae21
prism/Makefile: remove lib/prism.jar on clean
If lib/prism.jar exists (built by 'binary' target), it takes
precedence over newly compiled .class files. This is confusing, as
changing some sources, running 'make clean all' and then running PRISM
results in the "old" behaviour contained in lib/prism.jar.
Now, we remove lib/prism.jar on 'make clean'.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11789 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
b02abe82d9
Assume Java 8 now when building distributions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11677 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
09a9693138
Change location of documentation sources in Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11358 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
4a9c6cb7a8
Make sure automata package is rebuilt when needed from Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11320 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
e10b900018
Add Makefile target "count_loc" to display a count of lines of code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10979 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
91227cf4c8
Highlight some error messages in the Makefile (fix).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10790 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3a104c0760
Highlight some error messages in the Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10788 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
c143d38707
Makefil fix: Pass location of ngprism for tests/testslocal targets.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10728 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
69b2ed1f08
Makefile tests targets use Nailgun.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10622 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3464a921ad
First version of Nailgun support built directly into PRISM. Adding switch -ng when running prism will instead start a Nailgun server ready to run PRISM instances, and running ngprism runs PRISM as a Nailgun client.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10588 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3d35a4bd90
Add Makefile target to force rebuild of the parser.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10332 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
2112f7b9b4
Fix javadoc target in main Makefile
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10229 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0b8223c685
Explicit engine: Add BitSet statesOfInterest parameter to the various checkExpression... methods [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9551 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9d82693baf
Improvements to build process for Linux/Mac versions of lp_solve_java.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9519 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
2ddaf97daf
Experimental way of detecting jni.h if it is not in the same place as javac (e.g. on OS X Yosemite?).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9518 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
124fa87de6
Amend Makefile to use -encoding UTF8 setting more widely for javac/javah/javadoc (based on reports from SIFT).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9007 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
77bfea558f
Fix Makefile so that it does not mis-show ARCH as 86_64 when building on 32-bit Win.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8238 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
9c0273f878
Assume Java 7 not 6 when building binaries now.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8236 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
8b708ccc8e
Update build scripts to (potentially) allow 64 bit Windows installers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7597 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
cb62c36630
More Makefile fixes for Win 64 build.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7560 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Nishan Kamaleson
6bf4f3e279
Makefile ix
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7557 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
3cf85ee0ec
Re-attempt at 64-bit Cygwin Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7552 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
c9af690615
Attempt at 64-bit Cygwin Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7551 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
41abbe6df2
Fix Makefile to build on newer versions of Cygwin (-no-cygwin).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7547 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
c43b3e390a
Makefile fix for when there are two occurrences of jni_md.h (reported/fixed by Gaston Ingaramo).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7521 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
6c7df8d3ed
Missing part of last commit
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7121 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
2cedd3daf2
Update main Makefile to pass variables correctly to new cudd-5.0 Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6963 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Ernst Moritz Hahn
fd855d0ff4
reintegrated parametric stuff
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6786 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
7576896346
Remove some make dist_src checks no longer needed.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6719 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
0540a328d2
Always display VERSION on build, not just for dist_bin target.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6688 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
babc01ecdc
Makefile tweak: Display VERSION when building dist_bin.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6687 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c47365999d
Add Makefile target add_rev to build prism/Revision.java.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6677 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
b530cd78c8
Makefiles extract version number automatically using printversion script.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6673 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
1512c09e30
Just look in both "include" and "Headers" for jni header files, regardless of OS, since may differ for Apple vs Oracle Java 7 on Macs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6669 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
a6b2b4f3c7
Part 2 of Makefile fix from Steffen Marcker (64-bit detection on Macs)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6343 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
10ea5d9da0
Add building of new ext/ directory to Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6220 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c38378ad10
Makefile dist_bin target adds flags for javac to target Java 1.6.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5756 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c1dce97640
Makefile test targets used prism-auto.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4906 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
0c8948a71e
Fix makefiles with easier setup of classpath using * for jars.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4896 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
df5e8bf0ed
Makefile fix: 32-bit Mac JVM not detected properly (from -- )
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4795 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
b8e9b6b9d4
Fix previous Makefile addition + add d32/64 to Mac launch scripts.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4579 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
a0e74ef88b
Cleaner Makefile generation of bin scripts.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4578 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8f08dd6f37
Remove VERSIONS from installers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4518 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d8c06edca8
Makefile tweak re tests target (from prism-games).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4485 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
0974ca4b81
Makefile tweak: drop -mtune=native flag for 32-bit Linux compile: should be unnecessary.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4316 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8cff34fb12
Option to run local tests only.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4303 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8930a885ba
Makefile tweak: build local tests, if tests dir is present.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4301 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
ab6d2bbbef
Remove use of -lm linking under Cygwin.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4253 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago