Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
  • release_1_0_0
  • release_1_1_0
3 results

Target

Select target project
  • software-control-system/tango-devices/motion/pi/picontroller
1 result
Select Git revision
  • main
  • release_1_0_0
  • release_1_1_0
3 results
Show changes

Commits on Source 2

Show whitespace changes
Inline Side-by-side
pom.xml
View file @ 1d59d726
......@@ -4,15 +4,13 @@
<parent>
<groupId>fr.soleil</groupId>
<artifactId>super-pom-C-CPP-device</artifactId>
<version>21.2.5-64</version>
<version>RELEASE</version>
</parent>
<properties>
<PROJECT.name>PIController</PROJECT.name>
<PROJECT.version>1.0.0-SNAPSHOT</PROJECT.version>
<PROJECT.description>PIController motion PI controllers device controller</PROJECT.description>
<!-- path to the 64 bits libs ${libs-64bits} -->
<libs-64bits>/home/informatique/ica/ica/LIB_EL6_64</libs-64bits>
</properties>
<groupId>fr.soleil.device</groupId>
......@@ -33,114 +31,31 @@
<includePath>src</includePath>
<includePath>src/piaxis</includePath>
<includePath>src/pibox</includePath>
<includePath>${libs-64bits}/my_breakpad/include</includePath>
<includePath>${libs-64bits}/gsl-1.11/include</includePath>
<includePath>${libs-64bits}/lz4-r131/lib</includePath>
<includePath>${libs-64bits}/libtango9-9.2.5-64/include/</includePath>
<includePath>${libs-64bits}/libtango9-9.2.5-64/include/tango</includePath>
<includePath>${libs-64bits}/hdf5-1.8.16/include</includePath>
<includePath>${libs-64bits}/yat-1.18.6/include</includePath>
<includePath>${libs-64bits}/yat4tango-1.13.3/include</includePath>
</includePaths>
<defines>
<define>PROJECT_NAME=${project.name}</define>
<define>PROJECT_VERSION=${project.version}</define>
</defines>
</cpp>
<linker>
<libs>
<lib>
<name>omniORB4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>omniDynamic4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>COS4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>omniCodeSets4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>omnithread</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>zmq</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>tango</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>log4tango</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>lz4</name>
<type>shared</type>
<directory>${libs-64bits}/lz4-r131/lib/</directory>
</lib>
<lib>
<name>YAT-amd64-Linux-gcc-shared-release-1.18.6</name>
<type>shared</type>
<directory>${libs-64bits}/yat-1.18.6/lib</directory>
</lib>
<lib>
<name>YAT4Tango-amd64-Linux-gcc-shared-release-1.13.3</name>
<type>shared</type>
<directory>${libs-64bits}/yat4tango-1.13.3/lib</directory>
</lib>
<lib>
<name>gsl</name>
<type>shared</type>
<directory>${libs-64bits}/gsl-1.11/lib/</directory>
</lib>
<lib>
<name>gslcblas</name>
<type>shared</type>
<directory>${libs-64bits}/gsl-1.11/lib/</directory>
</lib>
<lib>
<name>breakpad_client</name>
<type>static</type>
<directory>${libs-64bits}/my_breakpad/lib</directory>
</lib>
</libs>
</linker>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>YAT4Tango-${aol}-${library}-${mode}</artifactId>
</dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>YAT-${aol}-${library}-${mode}</artifactId>
</dependency>
</dependencies>
<developers>
<developer>
<id>noureddine</id>
......
pom_el6_64.xml 0 → 100755
View file @ 1d59d726
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.soleil</groupId>
<artifactId>super-pom-C-CPP-device</artifactId>
<version>21.2.5-64</version>
</parent>
<properties>
<PROJECT.name>PIController</PROJECT.name>
<PROJECT.version>1.0.0-SNAPSHOT</PROJECT.version>
<PROJECT.description>PIController motion PI controllers device controller</PROJECT.description>
<!-- path to the 64 bits libs ${libs-64bits} -->
<libs-64bits>/home/informatique/ica/ica/LIB_EL6_64</libs-64bits>
</properties>
<groupId>fr.soleil.device</groupId>
<artifactId>${PROJECT.name}-amd64-Linux-gcc-shared-${mode}</artifactId>
<version>${PROJECT.version}</version>
<packaging>nar</packaging>
<name>${PROJECT.name}</name>
<description>${PROJECT.description}</description>
<build>
<plugins>
<plugin>
<groupId>org.freehep</groupId>
<artifactId>freehep-nar-plugin</artifactId>
<configuration>
<cpp>
<includePaths>
<includePath>src</includePath>
<includePath>src/piaxis</includePath>
<includePath>src/pibox</includePath>
<includePath>${libs-64bits}/my_breakpad/include</includePath>
<includePath>${libs-64bits}/gsl-1.11/include</includePath>
<includePath>${libs-64bits}/lz4-r131/lib</includePath>
<includePath>${libs-64bits}/libtango9-9.2.5-64/include/</includePath>
<includePath>${libs-64bits}/libtango9-9.2.5-64/include/tango</includePath>
<includePath>${libs-64bits}/hdf5-1.8.16/include</includePath>
<includePath>${libs-64bits}/yat-1.18.6/include</includePath>
<includePath>${libs-64bits}/yat4tango-1.13.3/include</includePath>
</includePaths>
<defines>
<define>PROJECT_NAME=${project.name}</define>
<define>PROJECT_VERSION=${project.version}</define>
</defines>
</cpp>
<linker>
<libs>
<lib>
<name>omniORB4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>omniDynamic4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>COS4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>omniCodeSets4</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>omnithread</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>zmq</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>tango</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>log4tango</name>
<type>shared</type>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<name>lz4</name>
<type>shared</type>
<directory>${libs-64bits}/lz4-r131/lib/</directory>
</lib>
<lib>
<name>YAT-amd64-Linux-gcc-shared-release-1.18.6</name>
<type>shared</type>
<directory>${libs-64bits}/yat-1.18.6/lib</directory>
</lib>
<lib>
<name>YAT4Tango-amd64-Linux-gcc-shared-release-1.13.3</name>
<type>shared</type>
<directory>${libs-64bits}/yat4tango-1.13.3/lib</directory>
</lib>
<lib>
<name>gsl</name>
<type>shared</type>
<directory>${libs-64bits}/gsl-1.11/lib/</directory>
</lib>
<lib>
<name>gslcblas</name>
<type>shared</type>
<directory>${libs-64bits}/gsl-1.11/lib/</directory>
</lib>
<lib>
<name>breakpad_client</name>
<type>static</type>
<directory>${libs-64bits}/my_breakpad/lib</directory>
</lib>
</libs>
</linker>
</configuration>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>noureddine</id>
<name>noureddine</name>
<url>http://controle/</url>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>manager</role>
</roles>
<timezone>1</timezone>
</developer>
<developer>
<id>desgranges</id>
<name>desgranges</name>
<url>http://controle/</url>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>1</timezone>
</developer>
<developer>
<id>bahji</id>
<name>bahji</name>
<url>http://controle/</url>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>1</timezone>
</developer>
</developers>
</project>

The place to be for your source code