From 805c37e197ca3e177c78560c9299beb675a061b0 Mon Sep 17 00:00:00 2001 From: Paulo Meira <10246101+PMeira@users.noreply.github.com> Date: Sat, 23 Nov 2019 23:11:51 -0300 Subject: [PATCH] Release 0.10.4, with updated DSS C-API (no MATLAB changes). This also adds packaging scripts, closes #1 --- +DSS_MATLAB/version.m | 2 +- .travis.yml | 87 +++++++++++++++++++++++++++++++++++++++++++ README.md | 6 +-- 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 .travis.yml diff --git a/+DSS_MATLAB/version.m b/+DSS_MATLAB/version.m index cee390b..20923c9 100644 --- a/+DSS_MATLAB/version.m +++ b/+DSS_MATLAB/version.m @@ -1,3 +1,3 @@ function result = version - result = '0.10.0a1'; + result = '0.10.4'; end \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..47adf76 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,87 @@ +language: generic + +env: + global: + - DSS_CAPI_VERSION=0.10.4 + - DSS_MATLAB_VERSION=0.10.4 + +matrix: + include: + - name: "linux_x64" + os: linux + before_install: + - sudo apt-get install patchelf + script: + - wget "https://github.com/dss-extensions/dss_capi/releases/download/${DSS_CAPI_VERSION}/dss_capi_${DSS_CAPI_VERSION}_${TRAVIS_JOB_NAME}.tar.gz" -Odss_capi.tar.gz -q + - tar zxf dss_capi.tar.gz + - mkdir -p release/dss_matlab + - cp -R "+DSS_MATLAB" "release/dss_matlab/+DSS_MATLAB" + - mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi_v7.so "release/dss_matlab/+DSS_MATLAB/dss_capi_v7.so" + - mv dss_capi/lib/${TRAVIS_JOB_NAME}/libklusolve.so "release/dss_matlab/+DSS_MATLAB/" + - mv dss_capi/KLUSOLVE_LICENSE "release/dss_matlab/" + - mv dss_capi/OPENDSS_LICENSE "release/dss_matlab/" + - mv dss_capi/LICENSE "release/dss_matlab/DSS_C-API_LICENSE" + - mv LICENSE release/dss_matlab/ + - mv README.md release/dss_matlab/ + - mv examples release/dss_matlab/ + - cd "release/dss_matlab/+DSS_MATLAB" + - patchelf --set-rpath '$ORIGIN/.' dss_capi_v7.so + - cd ../.. + - tar zcf dss_matlab_v${DSS_MATLAB_VERSION}_${TRAVIS_JOB_NAME}.tar.gz dss_matlab + - rm -rf dss_matlab + - ls -l + - cd .. + + - name: "win_x64" + os: linux + script: + - wget "https://github.com/dss-extensions/dss_capi/releases/download/${DSS_CAPI_VERSION}/dss_capi_${DSS_CAPI_VERSION}_${TRAVIS_JOB_NAME}.zip" -Odss_capi.zip -q + - unzip dss_capi.zip + - rm -f dss_capi/lib/${TRAVIS_JOB_NAME}/*_v8.dll + - mkdir -p release/dss_matlab + - cp -R "+DSS_MATLAB" "release/dss_matlab/+DSS_MATLAB" + - mv dss_capi/lib/${TRAVIS_JOB_NAME}/*.dll "release/dss_matlab/+DSS_MATLAB/" + - mv dss_capi/KLUSOLVE_LICENSE "release/dss_matlab/" + - mv dss_capi/OPENDSS_LICENSE "release/dss_matlab/" + - mv dss_capi/LICENSE "release/dss_matlab/DSS_C-API_LICENSE" + - mv LICENSE release/dss_matlab/ + - mv README.md release/dss_matlab/ + - mv examples release/dss_matlab/ + - cd release + - zip -r dss_matlab_v${DSS_MATLAB_VERSION}_${TRAVIS_JOB_NAME}.zip dss_matlab + - rm -rf dss_matlab + - ls -l + - cd .. + + - name: "darwin_x64" + os: osx + script: + - wget "https://github.com/dss-extensions/dss_capi/releases/download/${DSS_CAPI_VERSION}/dss_capi_${DSS_CAPI_VERSION}_${TRAVIS_JOB_NAME}.tar.gz" -Odss_capi.tar.gz -q + - tar zxf dss_capi.tar.gz + - mkdir -p release/dss_matlab + - cp -R "+DSS_MATLAB" "release/dss_matlab/+DSS_MATLAB" + - mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi_v7.dylib "release/dss_matlab/+DSS_MATLAB/dss_capi_v7.dylib" + - mv dss_capi/lib/${TRAVIS_JOB_NAME}/libklusolve.dylib "release/dss_matlab/+DSS_MATLAB/" + - mv dss_capi/KLUSOLVE_LICENSE "release/dss_matlab/" + - mv dss_capi/OPENDSS_LICENSE "release/dss_matlab/" + - mv dss_capi/LICENSE "release/dss_matlab/DSS_C-API_LICENSE" + - mv LICENSE release/dss_matlab/ + - mv README.md release/dss_matlab/ + - mv examples release/dss_matlab/ + - cd release + - tar zcf dss_matlab_v${DSS_MATLAB_VERSION}_macos_x64.tar.gz dss_matlab + - rm -rf dss_matlab + - ls -l + - cd .. + +deploy: + provider: releases + api_key: + secure: H/pX2HiiPlvyUjfuoldgC+mlD3+vB1yxYSBKURyIxr7h50KzAW/ASJjGZbQ8Q4VxQjs7ypXtx/hQjDepgH3xGvA+4XEIRWIc4E/QvKt3lDCIMQ1pmWEJSpKh8JgyAThemNxieTzp7HJb2jrRjLhRkl3EjQEbrYY1x+5j0O/x2hgiGwsDTsiImgA6gjRuN9+Hha1Oc4+HdJ0AtlZVCexnaaJSzIWirJ93y3d6xwtjF7yooDCAP69XmGSUkQjUMnCkDJii7KWD+RJ1XYngsXh73jhz3VA205JQykoi0pIgcQqRxvqYSXHF+ji1EDpfYHrU3Q9MWnyB99dGwgiNkVZ8F3VXAna6ihUE4Zpa25IaLrUeeW9KL317qOn8Y35eD1cUv/zujFA+NxrLCt2QBWfDURlSCpHpQLh/qzuBAQ9HB+kjMm9NFE1jdMa+WIgHtZyBnpTO3qdYK2qWtddYkop9fQOl/cMVKGkHdCc48R4gHRMfIU+93vMMXdaruigfhPuJliJIQB6Bi5lNWMaaNO5WdZ/LKHvZUScV+UMkZDEFsrCQ5bABtqfwNH9Om59RAJxbzvTmUYDqMGaHx3atNGcYAqZHZIA4Xy3DEt+/BVo7TqNtGU3RRaZDMA2Lw3eTnC+HNHdxnn8XAIMBW8MScn1VbYil07KC1czdfVv0VZpVtl0= + file_glob: true + file: release/* + draft: true + skip_cleanup: true + on: + repo: dss-extensions/dss_matlab + tags: true diff --git a/README.md b/README.md index ce773c5..c3aa932 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Related projects: - [`OpenDSSDirect.py`](http://github.com/dss-extensions/OpenDSSDirect.py): More pythonic bindings and useful tools. - [`DSS Sharp`](http://github.com/dss-extensions/dss_sharp/): .NET assembly to use the native DLL, mimics the COM object as used in .NET. -Version 0.10.3, released on 2019-06-14, covers most of the COM functions and classes, besides some extensions from DSS C-API. If you find a missing function or unexpected behavior, please open an issue on GitHub to both help us track and hopefully fix it, and also inform other users. +Version 0.10.4, released on 2019-11-23, covers most of the COM functions and classes, besides some extensions from DSS C-API. If you find a missing function or unexpected behavior, please open an issue on GitHub to both help us track and hopefully fix it, and also inform other users. ## Usage @@ -51,7 +51,7 @@ function [Start,Obj,Text] = DSSStartup Text = Obj.Text; ``` -On 2019-07-02, a simple example for the IEEE13 system was added in [13Bus.zip](https://github.com/dss-extensions/dss_matlab/raw/master/examples/13Bus.zip) if you want to try DSS_MATLAB with a sample circuit. The example files will be included in a future release to simplify the process. +On 2019-07-02, a simple example for the IEEE13 system was added in [13Bus.zip](https://github.com/dss-extensions/dss_matlab/raw/master/examples/13Bus.zip) if you want to try DSS_MATLAB with a sample circuit. This file is now also included in the download package. If you want more code to play with, you can use the MATLAB examples from the official OpenDSS distribution, from a local installation (e.g. `C:\OpenDSS\Examples\Matlab`) or from the [official SVN repository](https://sourceforge.net/p/electricdss/code/HEAD/tree/trunk/Distrib/Examples/Matlab/). @@ -67,7 +67,7 @@ https://github.com/dss-extensions/dss_capi/blob/master/docs/known_differences.md Most of these apply indirectly to DSS_MATLAB. -The [list of important changes](https://github.com/dss-extensions/dss_capi/blob/master/docs/changelog.md#version-0103) through development is also useful. +The [list of important changes](https://github.com/dss-extensions/dss_capi/blob/0.10.x/docs/changelog.md#version-0104) through development is also useful. ## Credits / Acknowlegement