Merge branch 'master' of https://github.com/z3prover/z3 into opt

src/api/dotnet/core/DummyContracts.cs

@@ -62,4 +62,4 @@ namespace System.Diagnostics.Contracts
         public static void EndContractBlock() { }
         public static T ValueAtReturn<T>(out T v) { T[] t = new T[1]; v = t[0]; return v; }
     }
-}
+}

src/api/dotnet/dotnet35/Example/App.config

@@ -3,4 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
-</configuration>
+</configuration>

src/api/dotnet/dotnet35/Example/Example.csproj

@@ -75,4 +75,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/api/dotnet/dotnet35/Microsoft.Z3.NET35.csproj

@@ -344,4 +344,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/api/dotnet/dotnet35/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Code.Contract" version="1.0.0" targetFramework="net35" />
-</packages>
+</packages>

src/api/python/setup.py

@@ -164,6 +164,6 @@ setup(
     package_data={
         'z3': [os.path.join('lib', '*'), os.path.join('include', '*.h'), os.path.join('include', 'c++', '*.h')]
     },
-    scripts=[os.path.join('bin', EXECUTABLE_FILE)],
+    data_files=[('bin',[os.path.join('bin',EXECUTABLE_FILE)])],
     cmdclass={'build': build, 'develop': develop, 'sdist': sdist, 'bdist_egg': bdist_egg},
 )

src/api/python/z3/z3.py

@@ -1300,8 +1300,10 @@ class BoolSortRef(SortRef):
         if isinstance(val, bool):
             return BoolVal(val, self.ctx)
         if __debug__:
-            _z3_assert(is_expr(val), "True, False or Z3 Boolean expression expected. Received %s" % val)
-            _z3_assert(self.eq(val.sort()), "Value cannot be converted into a Z3 Boolean value")
+            if not is_expr(val):
+               _z3_assert(is_expr(val), "True, False or Z3 Boolean expression expected. Received %s" % val)
+            if not self.eq(val.sort()):
+               _z3_assert(self.eq(val.sort()), "Value cannot be converted into a Z3 Boolean value")
         return val
 
     def subsort(self, other):