cameo merge requestshttps://code.ill.fr/cameo/cameo/-/merge_requests2022-11-30T09:30:08+01:00https://code.ill.fr/cameo/cameo/-/merge_requests/14Doc and cpack2022-11-30T09:30:08+01:00Shervin NourbakhshDoc and cpackA fix for Doxygen for the C++ API and adding the possibility to create RPM packages with CPack.A fix for Doxygen for the C++ API and adding the possibility to create RPM packages with CPack.https://code.ill.fr/cameo/cameo/-/merge_requests/13Api review2022-04-22T09:40:04+02:00yannick legocApi reviewhttps://code.ill.fr/cameo/cameo/-/merge_requests/12Linked apps2022-03-16T10:33:37+01:00yannick legocLinked appshttps://code.ill.fr/cameo/cameo/-/merge_requests/11Router proxy2022-03-04T15:41:14+01:00yannick legocRouter proxyUsing the router proxies optionally (flag in Server constructor).
The two C++ proxy programs are launched by the Cameo server.Using the router proxies optionally (flag in Server constructor).
The two C++ proxy programs are launched by the Cameo server.https://code.ill.fr/cameo/cameo/-/merge_requests/10Directory review2022-01-20T11:08:33+01:00yannick legocDirectory reviewhttps://code.ill.fr/cameo/cameo/-/merge_requests/9Merge Impl refactoring2022-01-04T09:20:13+01:00yannick legocMerge Impl refactoringhttps://code.ill.fr/cameo/cameo/-/merge_requests/8Fix lib install path2021-06-16T09:03:51+02:00Shervin NourbakhshFix lib install pathThere was an issue when creating Debian packages: the installation path for libraries was /usr/lib/ instead of /usr/lib/x86_64-linux-gnu/.
This is set by default whenever the CMAKE_PREFIX_PATH is /usr/ in Debian, but the default is /usr/...There was an issue when creating Debian packages: the installation path for libraries was /usr/lib/ instead of /usr/lib/x86_64-linux-gnu/.
This is set by default whenever the CMAKE_PREFIX_PATH is /usr/ in Debian, but the default is /usr/local/. So when creating the packages with the build_and_package.sh script, the CMAKE_PREFIX_PATH is set to /usr/.
The version of the cpp package is then increased to 1.1.1
A new tag should be created and also a new release.yannick legocyannick legochttps://code.ill.fr/cameo/cameo/-/merge_requests/7fixing cameopy name and location to debian defaults2021-06-03T14:28:10+02:00Shervin Nourbakhshfixing cameopy name and location to debian defaultsBy installing the debian package the cameopy module should be found without any modification of environment variables:
```
mvn install
./build_and_package.sh
sudo apt install /dev/shm/cameo/packages/cameo-api-python_1.0.0_all.deb /dev/sh...By installing the debian package the cameopy module should be found without any modification of environment variables:
```
mvn install
./build_and_package.sh
sudo apt install /dev/shm/cameo/packages/cameo-api-python_1.0.0_all.deb /dev/shm/cameo/packages/cameo-server-jzmq_1.0.2_all.deb
```
In the python3 interpreter:
`import cameopy`CMakeyannick legocyannick legochttps://code.ill.fr/cameo/cameo/-/merge_requests/6Debian packages for cameo and APIs2021-04-30T15:52:00+02:00Shervin NourbakhshDebian packages for cameo and APIs- Several changes to the README.md files documenting runtime and compilation dependencies
- cmake configuration files for building and installing cameo-server, cameo-console, cameo-api-cpp and cameo-api-python from source
- cpack configu...- Several changes to the README.md files documenting runtime and compilation dependencies
- cmake configuration files for building and installing cameo-server, cameo-console, cameo-api-cpp and cameo-api-python from source
- cpack configuration files for creating debian packages for cameo-server, cameo-console, cmaeo-api-cpp and cameo-api-pythonCMakeyannick legocyannick legochttps://code.ill.fr/cameo/cameo/-/merge_requests/5Rapidjson2020-11-25T11:33:13+01:00Shervin NourbakhshRapidjsonRapidjson v1.1.0 is downloaded if not available on the system.
JSON.h and BadFormatException.h headers are moved to src/ and become PRIVATE
Few some more comments for Doxygen documentationRapidjson v1.1.0 is downloaded if not available on the system.
JSON.h and BadFormatException.h headers are moved to src/ and become PRIVATE
Few some more comments for Doxygen documentationhttps://code.ill.fr/cameo/cameo/-/merge_requests/4[C++ API] fixed install path for public headers, updated project version,...2020-10-08T22:50:03+02:00Shervin Nourbakhsh[C++ API] fixed install path for public headers, updated project version,...[C++ API] fixed install path for public headers, updated project version, updated README with list of dependencies for Ubuntu[C++ API] fixed install path for public headers, updated project version, updated README with list of dependencies for UbuntuCMakehttps://code.ill.fr/cameo/cameo/-/merge_requests/3Cmake reorder files22020-10-09T08:53:16+02:00Shervin NourbakhshCmake reorder files2Changes:
- reordered files of the C++ API as follows:
- cameo-api-cpp/src/cameo/ -> cameo-api-cpp/src/
- public headers in cameo-api-cpp/include
- fixed the include paths removing the relative paths and letting CMake to provide...Changes:
- reordered files of the C++ API as follows:
- cameo-api-cpp/src/cameo/ -> cameo-api-cpp/src/
- public headers in cameo-api-cpp/include
- fixed the include paths removing the relative paths and letting CMake to provide the correct list of include directories where to find the headers
- removed protobuf from CMake configuration
- added a draft of clang-format configuration: at some point we should enforce its usage before any push in order to make sure that the code is written by everyone respecting a given set of rules
- benefits:
- avoid changes in spaces and indent that would create artificially large diffs
- the entire code has the same look
- added Doxygen config file for generating the documentation page
- added a README file with the list of dependencies and instructions to compile and install
- added a gitlab CI YML file for automatic compilation checks, currently only Ubuntu being used
- Added a CONTRIBUTING.md file with the instructions to propagate changes related to the C++ API from this repository to the dedicated C++ API repository using the "subtree" strategy.
### List of installed files:
```
Install the project...
-- Install configuration: ""
-- Installing: /tmp/devel/lib64/cmake/cameoConfigVersion.cmake
-- Installing: /tmp/devel/include/cameo/include
-- Installing: /tmp/devel/include/cameo/include/ConnectionTimeout.h
-- Installing: /tmp/devel/include/cameo/include/RequesterCreationException.h
-- Installing: /tmp/devel/include/cameo/include/cameo.h
-- Installing: /tmp/devel/include/cameo/include/Services.h
-- Installing: /tmp/devel/include/cameo/include/RemoteException.h
-- Installing: /tmp/devel/include/cameo/include/ConcurrentQueue.h
-- Installing: /tmp/devel/include/cameo/include/EventStreamSocket.h
-- Installing: /tmp/devel/include/cameo/include/Response.h
-- Installing: /tmp/devel/include/cameo/include/Event.h
-- Installing: /tmp/devel/include/cameo/include/ConnectionChecker.h
-- Installing: /tmp/devel/include/cameo/include/EventListener.h
-- Installing: /tmp/devel/include/cameo/include/SubscriberCreationException.h
-- Installing: /tmp/devel/include/cameo/include/UnmanagedApplicationException.h
-- Installing: /tmp/devel/include/cameo/include/OutputStreamSocket.h
-- Installing: /tmp/devel/include/cameo/include/InvalidArgumentException.h
-- Installing: /tmp/devel/include/cameo/include/PublisherCreationException.h
-- Installing: /tmp/devel/include/cameo/include/Server.h
-- Installing: /tmp/devel/include/cameo/include/SocketException.h
-- Installing: /tmp/devel/include/cameo/include/Serializer.h
-- Installing: /tmp/devel/include/cameo/include/TimeCondition.h
-- Installing: /tmp/devel/include/cameo/include/Application.h
-- Installing: /tmp/devel/include/cameo/include/ResponderCreationException.h
-- Installing: /tmp/devel/lib64/libcameo.so.0.3.0
-- Installing: /tmp/devel/lib64/libcameo.so.0
-- Installing: /tmp/devel/lib64/libcameo.so
-- Installing: /tmp/devel/lib64/cmake/cameoConfig.cmake
-- Installing: /tmp/devel/lib64/cmake/cameoConfig-noconfig.cmake
```
This merge request addresses the following issues:
- #55
### Propagation of changes from this repository to the one dedicated to the C++ API
The main issue is that fake commits are created by the process. A string "(split#)" is prepended to the commit message to recognize them. They should be ignored when looking at the history.Python APIhttps://code.ill.fr/cameo/cameo/-/merge_requests/2Split2020-10-05T12:51:31+02:00Shervin NourbakhshSplitThe C++ API is now in a separate repository: https://code.ill.fr/nourbakhsh/cameo-api-cpp/
All the files have been removed from this repository.
The C++ API is added as a subtree, but I don't think it is really necessary...The C++ API is now in a separate repository: https://code.ill.fr/nourbakhsh/cameo-api-cpp/
All the files have been removed from this repository.
The C++ API is added as a subtree, but I don't think it is really necessary...https://code.ill.fr/cameo/cameo/-/merge_requests/1WIP: Cmake2020-07-02T11:57:03+02:00Shervin NourbakhshWIP: CmakeThis should partially address #55
I have introduced a CMakeLists.txt file for the C++ API
I have added a .gitlab-ci.yml file to have CI pipelines.
I have also added a Doxygen config file with the possibility to create the docume...This should partially address #55
I have introduced a CMakeLists.txt file for the C++ API
I have added a .gitlab-ci.yml file to have CI pipelines.
I have also added a Doxygen config file with the possibility to create the documentation. It should automagically produced by the CI pipeline on the master branch.
I had to change the include of the protobuf header file the following files:
```
cameo-api-cpp/src/cameo/EventStreamSocket.cpp
cameo-api-cpp/src/cameo/OutputStreamSocket.cpp
cameo-api-cpp/src/cameo/Serializer.cpp
cameo-api-cpp/src/cameo/impl/ServicesImpl.h
```
as follows:
```
-#include "../proto/Messages.pb.h"
+#include "Messages.pb.h"
```
I think that it is much cleaner if those files are in the build/ directory. By the way, I have not found ways of getting them in the proto/ directory as it was with libtool.
If you accept the change, maybe we can also change that behaviour with libtool.