diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..afa7075ce03b270613df4ea674334ecd3fcc3630 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,57 @@ +image: registry.gitlab.lif.univ-mrs.fr:5005/dev/mincoverpetri/mincoverpetri + +tests_default: + tags: + - docker + script: + - mkdir build + - cd build + - cmake .. + - make coverage + - make memcheck + +tests_release: + tags: + - docker + script: + - mkdir build + - cd build + - cmake -D CMAKE_BUILD_TYPE=Release .. + - make coverage + - make memcheck + +pages: + tags: + - docker + only: + - master + script: + - mkdir public build build_linux build_win32 build_win64 + - cd build + - cmake .. + - make coverage + - mv coverage ../public + - make doc + - mv ../doc ../public + - cd ../build_linux + - cmake -D STATIC_LINK=ON -D CMAKE_BUILD_TYPE=Release .. + - make zip_archive + - mv *.zip ../public + - cd ../build_win32 + - cmake -D CROSS_COMPILE_WIN32=ON -D STATIC_LINK=ON \ + -D CMAKE_BUILD_TYPE=Release .. + - make zip_archive + - mv *.zip ../public + - cd ../build_win64 + - cmake -D CROSS_COMPILE_WIN64=ON -D STATIC_LINK=ON \ + -D CMAKE_BUILD_TYPE=Release .. + - make zip_archive + - mv *.zip ../public + - cd .. + - ./webpage/generate_webpage.sh readme.md ./build_linux/mincoverpetri \ + public/index.html + - cp tests/data/07.pnml public/figure_7.pnml + artifacts: + paths: + - public + diff --git a/readme.md b/readme.md index 3d7c1157cbdef05d75d81ee0113cf64503202cfe..d11bcf8397348f752e455f95ad88cc8049868fb2 100644 --- a/readme.md +++ b/readme.md @@ -63,7 +63,8 @@ The **source code** can be downloaded from the associated The build instructions are given in the [developer documentation](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html) -and in the file src/developer_documentation.dox. +and in the file +[src/developer_documentation.dox](src/developer_documentation.dox). Documentation ---- @@ -85,7 +86,8 @@ documentation](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html) is available online. It can also be automatically generated from the source code using -[Doxygen](http://www.doxygen.org) (see src/developer_documentation.dox +[Doxygen](http://www.doxygen.org) (see +[src/developer_documentation.dox](src/developer_documentation.dox) for details). Dependencies diff --git a/src/developer_documentation.dox b/src/developer_documentation.dox index 1f6cb54d64f73c6c70d5577a441b8099111bb002..a4d12f2663d77c9abbada75de4261ae20220881e 100644 --- a/src/developer_documentation.dox +++ b/src/developer_documentation.dox @@ -332,9 +332,12 @@ * A Docker image is used to run the continuous integration tasks. * * This image is publicly accessible and can be used as a preconfigured - * development environment if wanted. + * development environment if wanted. For example, to run the image + * in an interactive session, run: * - * The instructions on how to use this Docker image are available in this + * docker run -it registry.gitlab.lif.univ-mrs.fr:5005/dev/mincoverpetri/mincoverpetri + * + * Some instructions about this Docker image are available in this * [page](https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri/container_registry). * * The Dockerfile used to generate the Docker image is available in the diff --git a/src/main.hpp b/src/main.hpp index 0967af69ac598f3a11f7edb8e4c294957f9c90a2..83dda28417707df78c3e4d4de8f4fcda9562de49 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -40,7 +40,7 @@ #include "mincoversetcomputer.hpp" -#define VERSION_NUMBER "0.0.0" ///< Version number of the application +#define VERSION_NUMBER "1.0.0" ///< Version number of the application /** * \brief Set of flags parametrizing the output sent to stdout by the diff --git a/webpage/generate_webpage.sh b/webpage/generate_webpage.sh index 1c1e4417123ce6dd8f80b1fcdbc62c24657d41c6..677157fdbb581ef8ce4e971cc08273fa9bc4fc4d 100755 --- a/webpage/generate_webpage.sh +++ b/webpage/generate_webpage.sh @@ -81,7 +81,7 @@ The source code can be downloaded from the associated The build instructions are given in the [developer -documentation](/doc/src/html). +documentation](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html). ### Example data @@ -119,7 +119,8 @@ echo \ ### Developer documentation -The developer documentation is available [here](doc/src/html). +The developer documentation is available +[here](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html). " >> ${TMP_PREFIX}doc