Skip to content

Commit

Permalink
patch level bump so I can rebuild the PPA packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
ianamason committed Sep 29, 2017
1 parent 7b36fcd commit 2a90fce
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
#
# This file is part of the Yices SMT Solver.
# Copyright (C) 2017 SRI International.
#
#
# Yices is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
#
# Yices is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with Yices. If not, see <http://www.gnu.org/licenses/>.
#
Expand Down Expand Up @@ -50,7 +50,7 @@ YICES_TOP_DIR=$(shell pwd)
#
MAJOR = 2
MINOR = 5
PATCH_LEVEL = 3
PATCH_LEVEL = 4

YICES_VERSION = $(MAJOR).$(MINOR).$(PATCH_LEVEL)

Expand Down Expand Up @@ -286,4 +286,3 @@ checkgmake:
.PHONY: checkgmake show-config doc all bin lib obj dist \
static-bin static-lib static-obj static-dist install \
test static-test

10 changes: 6 additions & 4 deletions src/bindings/python/yices.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def main():
# 1.0.4 - 2.5.3 - 9/28/2017 - LD_LIBRARY_PATH hackery. #
# 1.0.5 - 2.5.3 - 9/28/2017 - LD_LIBRARY_PATH hackery, II. #
# 1.0.6 - 2.5.3 - 9/28/2017 - LD_LIBRARY_PATH hackery, III. #
# 1.0.7 - 2.5.4 - 9/29/2017 - patch level version bump for PPA goodness #
# #
########################################################################################

Expand All @@ -105,12 +106,13 @@ def main():
# while the bindings are moving so fast we should keep them separate.
#
#
yices_python_version = '1.0.6'
yices_python_version = '1.0.7'

#
# 1.0.1 needs yices_has_mcsat
# 1.0.1-7 needs the _fd api additions that appear in 2.5.4
#
yices_recommended_version = '2.5.3'
yices_recommended_version = '2.5.4'


class YicesException(Exception):
Expand Down Expand Up @@ -150,8 +152,8 @@ def wrapper(*args, **kwargs):
# really help anyway, since we would probably be getting the sudo
# version not the user's version. Probably the real issue is that
# on Linux yices installs in /usr/local/lib but the ctype loading probably
# expects ii to be in some x86_64 archified directory. HOWEVER, if find_library
# can find the name correctly, you would expect the it could also load the
# expects it to be in some x86_64 archified directory. HOWEVER, if find_library
# can find the name correctly, you would expect that it could also load the
# puppy correctly.
#
def _loadYicesFromPath(path, library):
Expand Down
2 changes: 1 addition & 1 deletion src/include/yices.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extern "C" {

#define __YICES_VERSION 2
#define __YICES_VERSION_MAJOR 5
#define __YICES_VERSION_PATCHLEVEL 3
#define __YICES_VERSION_PATCHLEVEL 4


/*
Expand Down

0 comments on commit 2a90fce

Please sign in to comment.