Skip to content

Commit

Permalink
bum version number
Browse files Browse the repository at this point in the history
  • Loading branch information
grzegorzmazur committed Feb 20, 2018
1 parent 8487b2a commit 4480ead
Show file tree
Hide file tree
Showing 18 changed files with 281 additions and 44 deletions.
50 changes: 50 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"/usr/include/x86_64-linux-gnu/c++/7",
"/usr/include/c++/7",
"/usr/local/include",
"/usr/lib/clang/5.0/include",
"/usr/lib/gcc/x86_64-linux-gnu/7/include",
"/usr/include/x86_64-linux-gnu",
"/usr/include",
"/usr/include/x86_64-linux-gnu/qt5",
"/usr/include/x86_64-linux-gnu/qt5/QtCore",
"${workspaceRoot}",
"${workspaceRoot}/cyacas/libyacas/include",
"${workspaceRoot}/cyacas/libymp/include",
"${workspaceRoot}/cyacas/yacas/include",
"${workspaceRoot}/cyacas/yacas-gui/include",
"${workspaceRoot}/build/cyacas/libyacas/config",
"${workspaceRoot}/build/cyacas/yacas-gui"
],
"defines": [],
"intelliSenseMode": "clang-x64",
"browse": {
"path": [
"/usr/include/x86_64-linux-gnu/c++/7",
"/usr/include/c++/7",
"/usr/local/include",
"/usr/lib/clang/5.0/include",
"/usr/lib/gcc/x86_64-linux-gnu/7/include",
"/usr/include/x86_64-linux-gnu",
"/usr/include",
"/usr/include/x86_64-linux-gnu/qt5",
"/usr/include/x86_64-linux-gnu/qt5/QtCore",
"${workspaceRoot}",
"${workspaceRoot}/cyacas/libyacas/include",
"${workspaceRoot}/cyacas/libymp/include",
"${workspaceRoot}/cyacas/yacas/include",
"${workspaceRoot}/cyacas/yacas-gui/include",
"${workspaceRoot}/build/cyacas/libyacas/config",
"${workspaceRoot}/build/cyacas/yacas-gui"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": "database"
}
}
],
"version": 3
}
82 changes: 82 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch yacas",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/build/cyacas/yacas/yacas",
"args": ["--rootdir", "${workspaceRoot}/scripts/"],
"stopAtEntry": false,
"cwd": "${workspaceRoot}",
"environment": [],
"externalConsole": true,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
},
{
"name": "(gdb) Launch yacas arithmetic.yts",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/build/cyacas/yacas/yacas",
"args": ["--rootdir", "${workspaceRoot}/scripts/", "${workspaceRoot}/tests/arithmetic.yts"],
"stopAtEntry": false,
"cwd": "${workspaceRoot}",
"environment": [],
"externalConsole": true,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
},
{
"name": "(gdb) Launch yacas numerics.yts",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/build/cyacas/yacas/yacas",
"args": ["--rootdir", "${workspaceRoot}/scripts/", "${workspaceRoot}/tests/numerics.yts"],
"stopAtEntry": false,
"cwd": "${workspaceRoot}",
"environment": [],
"externalConsole": true,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
},
{
"name": "(gdb) Launch yacas orthopoly.yts",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/build/cyacas/yacas/yacas",
"args": ["--rootdir", "${workspaceRoot}/scripts/", "${workspaceRoot}/tests/orthoppoly.yts"],
"stopAtEntry": false,
"cwd": "${workspaceRoot}",
"environment": [],
"externalConsole": true,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
}
],
"compounds": []
}
57 changes: 57 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"C_Cpp.intelliSenseEngine": "Default",
"editor.insertSpaces": true,
"editor.tabSize": 4,
"editor.detectIndentation": true,
"files.associations": {
"*.ltx": "latex",
"cctype": "cpp",
"cmath": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"array": "cpp",
"atomic": "cpp",
"*.tcc": "cpp",
"chrono": "cpp",
"condition_variable": "cpp",
"cstdint": "cpp",
"exception": "cpp",
"functional": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iosfwd": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"ratio": "cpp",
"stdexcept": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeinfo": "cpp",
"utility": "cpp",
"codecvt": "cpp",
"bitset": "cpp",
"clocale": "cpp",
"fstream": "cpp",
"iomanip": "cpp",
"iostream": "cpp",
"istream": "cpp",
"memory": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"streambuf": "cpp",
"algorithm": "cpp",
"*.ipp": "cpp"
},
"python.pythonPath": "/usr/bin/python3",
"restructuredtext.workspaceRoot": "/home/mazur/Code/yacas-develop"
}
48 changes: 48 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
},
"command": "cmake --build .",
"options": {
"cwd": "${workspaceRoot}/build"
},
"problemMatcher": {
"base": "$gcc",
"fileLocation": "absolute"
}
},
{
"label": "install",
"type": "shell",
"group": {
"kind": "build"
},
"command": "cmake --build . --target install",
"options": {
"cwd": "${workspaceRoot}/build"
},
"problemMatcher": {
"base": "$gcc",
"fileLocation": "absolute"
}
},
{
"label": "test",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
},
"command": "cmake --build . --target test",
"options": {
"cwd": "${workspaceRoot}/build"
}
}
]
}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (ENABLE_JYACAS)
set (LANGUAGES ${LANGUAGES} Java)
endif ()

project (YACAS VERSION 1.6.1 LANGUAGES ${LANGUAGES})
project (YACAS VERSION 1.7.0 LANGUAGES ${LANGUAGES})

set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
8 changes: 4 additions & 4 deletions INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ Installation from sources
Getting sources
---------------

Version 1.6.0 can be downloaded from
`<https://github.com/grzegorzmazur/yacas/archive/v1.6.0.zip>`_ or
`<https://github.com/grzegorzmazur/yacas/archive/v1.6.0.tar.gz>`_,
Version 1.7.0 can be downloaded from
`<https://github.com/grzegorzmazur/yacas/archive/v1.7.0.zip>`_ or
`<https://github.com/grzegorzmazur/yacas/archive/v1.7.0.tar.gz>`_,
while the current development version is accessible from
`<https://github.com/grzegorzmazur/yacas/archive/develop.zip>`_.

Expand All @@ -28,7 +28,7 @@ Common build options
Build text console for the native yacas engine. Enabled by default.

`ENABLE_CYACAS_GUI`
Build graphical interface for the native yacas engine. Requires Qt 5.5. Enabled by default.
Build graphical interface for the native yacas engine. Requires Qt 5.9+. Enabled by default.

`ENABLE_CYACAS_KERNEL`
Build native yacas kernel for Jupyter Notebook. Requires Boost, ZeroMQ and zmqpp. Disabled by default.
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<description>
jyacas build file
</description>
<property name="version" value="1.6.1" />
<property name="version" value="1.7.0" />
<property name="main" value="net.sf.yacas.YacasConsole" />
<property name="src" location="jyacas" />
<property name="scripts" location="scripts" />
Expand Down
4 changes: 2 additions & 2 deletions cyacas/packaging/deb/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
yacas (1.6.1-1) UNRELEASED; urgency=low
yacas (1.7.1-1) UNRELEASED; urgency=low

* Changes are none, there is only the now (Ayal Pinkus)

-- Grzegorz Mazur <teoretyk@gmail.com> Sun, 06 Nov 2016 18:55:16 +0200
-- Grzegorz Mazur <teoretyk@gmail.com> Thu, 15 Feb 2018 19:38:12 +0200
20 changes: 10 additions & 10 deletions cyacas/packaging/ebuild/yacas.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ IUSE="doc gui java +jupyter static-libs"

DEPEND="
doc? ( dev-python/sphinx )
gui? ( >=dev-qt/qtcore-5.5[icu]
>=dev-qt/qtgui-5.5
>=dev-qt/qtwidgets-5.5
>=dev-qt/qtnetwork-5.5
>=dev-qt/qtwebkit-5.5
>=dev-qt/qtmultimedia-5.5
>=dev-qt/qtsql-5.5
>=dev-qt/qtprintsupport-5.5
>=dev-qt/qtopengl-5.5
>=dev-qt/qtprintsupport-5.5 )
gui? ( >=dev-qt/qtcore-5.6[icu]
>=dev-qt/qtgui-5.6
>=dev-qt/qtwidgets-5.6
>=dev-qt/qtnetwork-5.6
>=dev-qt/qtwebkit-5.6
>=dev-qt/qtmultimedia-5.6
>=dev-qt/qtsql-5.6
>=dev-qt/qtprintsupport-5.6
>=dev-qt/qtopengl-5.6
>=dev-qt/qtprintsupport-5.6 )
jupyter? ( dev-python/jupyter
dev-libs/boost
dev-libs/jsoncpp
Expand Down
20 changes: 10 additions & 10 deletions cyacas/packaging/flatpak/org.yacas.yacas-gui.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"app-id": "org.yacas.yacas-gui",
"branch": "1.6",
"branch": "1.7",
"runtime": "org.freedesktop.Platform",
"runtime-version": "1.4",
"runtime-version": "1.6",
"sdk": "org.freedesktop.Sdk",
"command": "yacas-gui",
"finish-args": [
Expand Down Expand Up @@ -50,7 +50,7 @@
{
"type": "git",
"url": "git://code.qt.io/qt/qtbase.git",
"branch": "v5.6.2"
"branch": "v5.10.1"
}
]
},
Expand All @@ -61,7 +61,7 @@
{
"type": "git",
"url": "git://code.qt.io/qt/qtsvg.git",
"branch": "v5.6.2"
"branch": "v5.10.1"
},
{
"type": "script",
Expand All @@ -71,13 +71,13 @@
]
},
{
"name": "qt5-qtwebkit",
"name": "qt5-qtwebengine",
"cleanup": [ "/bin", "/mkspecs" ],
"sources": [
{
"type": "archive",
"url": "http://download.qt.io/community_releases/5.6/5.6.2/qtwebkit-opensource-src-5.6.2.tar.gz",
"sha256": "0b85d8e0ac30b0b797d2b8502024a6a1352dc4b7ea95d256904fbd62a82a27d5"
"type": "git",
"url": "git://code.qt.io/qt/qtwebengine.git",
"branch": "v5.10.1"
},
{
"type": "script",
Expand All @@ -91,14 +91,14 @@
"sources": [
{
"type": "archive",
"url": "https://github.com/grzegorzmazur/yacas/archive/v1.6.1.tar.gz",
"url": "https://github.com/grzegorzmazur/yacas/archive/v1.7.0.tar.gz",
"sha256": "6b94394f705bed70a9d104967073efd6c23e9eb1a832805c4d805ef875555ae5"
}
],
"sources": [
{
"type": "archive",
"url": "https://github.com/grzegorzmazur/yacas/archive/v1.6.1.tar.gz",
"url": "https://github.com/grzegorzmazur/yacas/archive/v1.7.0.tar.gz",
"sha256": "6b94394f705bed70a9d104967073efd6c23e9eb1a832805c4d805ef875555ae5"
}
],
Expand Down

0 comments on commit 4480ead

Please sign in to comment.