This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new f5f00644df fix: Tried getting the build back to work.
f5f00644df is described below
commit f5f00644dfae9aeafcb91bc8c2c814dda9d749f2
Author: Christofer Dutz <[email protected]>
AuthorDate: Sat Aug 2 14:49:38 2025 +0200
fix: Tried getting the build back to work.
---
.../generated-sources/test/CMakeLists.txt | 6 +-
.../c/src/test/resources/integration-test/pom.xml | 4 +-
.../language/go/src/test/resources/plc4go/pom.xml | 4 +-
.../python/src/test/resources/plc4py/pom.xml | 4 +-
plc4py/pom.xml | 176 ++++++++++-----------
5 files changed, 96 insertions(+), 98 deletions(-)
diff --git
a/code-generation/language/c/src/test/resources/integration-test/generated-sources/test/CMakeLists.txt
b/code-generation/language/c/src/test/resources/integration-test/generated-sources/test/CMakeLists.txt
index 698c64bb0c..bc94c267d9 100644
---
a/code-generation/language/c/src/test/resources/integration-test/generated-sources/test/CMakeLists.txt
+++
b/code-generation/language/c/src/test/resources/integration-test/generated-sources/test/CMakeLists.txt
@@ -17,12 +17,12 @@
under the License.
]]
-include_directories("include" "../../../../../../../plc4c/spi/include"
"../../../../../../../plc4c/api/include")
+include_directories("include" "../../../../../../../../plc4c/spi/include"
"../../../../../../../../plc4c/api/include")
# Add the sources
file(GLOB sources "src/*.c")
-file(GLOB spi_sources "../../../../../../../../plc4c/spi/src/*.c")
-file(GLOB spi_utils_sources "../../../../../../../../plc4c/spi/src/utils/*.c")
+file(GLOB spi_sources "../../../../../../../../../plc4c/spi/src/*.c")
+file(GLOB spi_utils_sources
"../../../../../../../../../plc4c/spi/src/utils/*.c")
add_library(plc4c-driver-test ${sources} ${spi_sources} ${spi_utils_sources})
diff --git
a/code-generation/language/c/src/test/resources/integration-test/pom.xml
b/code-generation/language/c/src/test/resources/integration-test/pom.xml
index a6e6908d18..6fe3f49352 100644
--- a/code-generation/language/c/src/test/resources/integration-test/pom.xml
+++ b/code-generation/language/c/src/test/resources/integration-test/pom.xml
@@ -195,11 +195,11 @@
<sourcePath>${project.basedir}</sourcePath>
<!--
Path to where the build configuration is generated
- (This directory is then used in the compile step to actually
perform the build)
+ (This directory is then used in the compile-step to actually
perform the build)
-->
<targetPath>${project.build.directory}/build</targetPath>
<!--
- Name of the generator the compile step will be executing.
+ Name of the generator the compile-step will be executing.
-->
<generator>${cmake.generator}</generator>
<!-- The directory where the "generate" step generated the build
configuration -->
diff --git a/code-generation/language/go/src/test/resources/plc4go/pom.xml
b/code-generation/language/go/src/test/resources/plc4go/pom.xml
index ed5cba8cb2..3e47a6a7bf 100644
--- a/code-generation/language/go/src/test/resources/plc4go/pom.xml
+++ b/code-generation/language/go/src/test/resources/plc4go/pom.xml
@@ -53,7 +53,7 @@
<resources>
<resource>
<targetPath>.</targetPath>
- <directory>../../../../../plc4go/pkg</directory>
+ <directory>../../../../../../plc4go/pkg</directory>
<filtering>false</filtering>
</resource>
</resources>
@@ -71,7 +71,7 @@
<resources>
<resource>
<targetPath>.</targetPath>
- <directory>../../../../../plc4go/spi</directory>
+ <directory>../../../../../../plc4go/spi</directory>
<excludes>
<exclude>testutils/**</exclude>
</excludes>
diff --git a/code-generation/language/python/src/test/resources/plc4py/pom.xml
b/code-generation/language/python/src/test/resources/plc4py/pom.xml
index e6bb4501ef..fc91bc3cb5 100644
--- a/code-generation/language/python/src/test/resources/plc4py/pom.xml
+++ b/code-generation/language/python/src/test/resources/plc4py/pom.xml
@@ -51,7 +51,7 @@
<resources>
<resource>
<targetPath>.</targetPath>
-
<directory>${project.basedir}/../../../../../plc4py/</directory>
+
<directory>${project.basedir}/../../../../../../plc4py/</directory>
<includes>
<include>pyproject.toml</include>
</includes>
@@ -72,7 +72,7 @@
<resources>
<resource>
<targetPath>.</targetPath>
-
<directory>${project.basedir}/../../../../../plc4py/plc4py</directory>
+
<directory>${project.basedir}/../../../../../../plc4py/plc4py</directory>
<filtering>false</filtering>
</resource>
</resources>
diff --git a/plc4py/pom.xml b/plc4py/pom.xml
index dc6dd88d80..cf410d40ef 100644
--- a/plc4py/pom.xml
+++ b/plc4py/pom.xml
@@ -40,95 +40,6 @@
<option.with-proxies>OFF</option.with-proxies>
</properties>
- <profiles>
- <profile>
- <id>update-generated-code</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.plc4x.plugins</groupId>
- <artifactId>plc4x-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-modbus-driver</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-driver</goal>
- </goals>
- <configuration>
- <protocolName>modbus</protocolName>
- <languageName>python</languageName>
- <outputFlavor>read-write</outputFlavor>
- <outputDir>${project.basedir}/plc4py/protocols</outputDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-simulated-driver</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-driver</goal>
- </goals>
- <configuration>
- <protocolName>simulated</protocolName>
- <languageName>python</languageName>
- <outputFlavor>read-write</outputFlavor>
- <outputDir>${project.basedir}/plc4py/protocols</outputDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-umas-driver</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-driver</goal>
- </goals>
- <configuration>
- <protocolName>umas</protocolName>
- <languageName>python</languageName>
- <outputFlavor>read-write</outputFlavor>
- <outputDir>${project.basedir}/plc4py/protocols</outputDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4x-code-generation-language-python</artifactId>
- <version>0.14.0-SNAPSHOT</version>
- <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4x-protocols-modbus</artifactId>
- <version>0.14.0-SNAPSHOT</version>
- <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4x-protocols-simulated</artifactId>
- <version>0.14.0-SNAPSHOT</version>
- <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4x-protocols-umas</artifactId>
- <version>0.14.0-SNAPSHOT</version>
- <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<build>
<sourceDirectory>src/main/python</sourceDirectory>
<testSourceDirectory>src/test/python</testSourceDirectory>
@@ -332,6 +243,93 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>update-generated-code</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.plc4x.plugins</groupId>
+ <artifactId>plc4x-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-modbus-driver</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-driver</goal>
+ </goals>
+ <configuration>
+ <protocolName>modbus</protocolName>
+ <languageName>python</languageName>
+ <outputFlavor>read-write</outputFlavor>
+ <outputDir>${project.basedir}/plc4py/protocols</outputDir>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-simulated-driver</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-driver</goal>
+ </goals>
+ <configuration>
+ <protocolName>simulated</protocolName>
+ <languageName>python</languageName>
+ <outputFlavor>read-write</outputFlavor>
+ <outputDir>${project.basedir}/plc4py/protocols</outputDir>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-umas-driver</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-driver</goal>
+ </goals>
+ <configuration>
+ <protocolName>umas</protocolName>
+ <languageName>python</languageName>
+ <outputFlavor>read-write</outputFlavor>
+ <outputDir>${project.basedir}/plc4py/protocols</outputDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4x-code-generation-language-python</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4x-protocols-modbus</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4x-protocols-simulated</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4x-protocols-umas</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <!-- Scope is 'provided' as this way it's not shipped with the
driver -->
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
