Merge branch 'release-1.6.0'

smackers · Sep 3, 2016 · fd8e9e5 · fd8e9e5
2 parents bf5b9eb + 0ed5608
commit fd8e9e5
Show file tree

Hide file tree

Showing 120 changed files with 1,913 additions and 37,154 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,8 @@
 
 # detect all text files and automatically normalize them (convert CRLF to LF)
 *       text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.sh         text eol=lf
+*.py         text eol=lf
+bin/*        text eol=lf
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -158,6 +158,7 @@ add_library(smackTranslator STATIC
   include/smack/SimplifyLibCalls.h
   include/smack/SmackRep.h
   include/smack/SmackRepFlatMem.h
+  include/smack/MemorySafetyChecker.h
   lib/smack/BoogieAst.cpp
   lib/smack/BplFilePrinter.cpp
   lib/smack/BplPrinter.cpp
@@ -173,6 +174,7 @@ add_library(smackTranslator STATIC
   lib/smack/SimplifyLibCalls.cpp
   lib/smack/SmackRep.cpp
   lib/smack/SmackRepFlatMem.cpp
+  lib/smack/MemorySafetyChecker.cpp
 )
 
 add_executable(llvm2bpl

diff --git a/Doxyfile b/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = smack
-PROJECT_NUMBER         = 1.5.2
+PROJECT_NUMBER         = 1.6.0
 PROJECT_BRIEF          = "A bounded software verifier."
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = docs

diff --git a/LICENSE b/LICENSE
@@ -5,7 +5,9 @@ Copyright (c) 2008-2016 Zvonimir Rakamaric ([email protected]),
 Modified work Copyright (c) 2013-2016 Pantazis Deligiannis,
                                       Montgomery Carter,
                                       Arvind Haran,
-                                      Shaobo He
+                                      Shaobo He,
+                                      Jiten Thakkar,
+                                      Jonathan Whitaker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
diff --git a/Makefile.common.in b/Makefile.common.in