[Project] Also copy native libs to distribution zip

Pi4J · Jan 21, 2022 · dfbaa0f · dfbaa0f
1 parent aeaf52c
commit dfbaa0f
Showing 1 changed file with 67 additions and 21 deletions.
diff --git a/pi4j-distribution/pom.xml b/pi4j-distribution/pom.xml
@@ -47,13 +47,58 @@
             <artifactId>pi4j-plugin-pigpio</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.pi4j</groupId>
+            <artifactId>pi4j-plugin-linuxfs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- include Pi4J Plugins (Platforms and I/O Providers) -->
         <dependency>
             <groupId>com.pi4j</groupId>
             <artifactId>pi4j-library-pigpio</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.pi4j</groupId>
+            <artifactId>pi4j-library-linuxfs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--
+            include Pi4J native libraries
+        -->
+        <!-- pigpio -->
+        <dependency>
+            <groupId>com.pi4j</groupId>
+            <artifactId>pi4j-library-pigpio</artifactId>
+            <version>${project.version}</version>
+            <classifier>armhf</classifier>
+            <type>so</type>
+        </dependency>
+        <dependency>
+            <groupId>com.pi4j</groupId>
+            <artifactId>pi4j-library-pigpio</artifactId>
+            <version>${project.version}</version>
+            <classifier>aarch64</classifier>
+            <type>so</type>
+        </dependency>
+
+        <!-- linuxfs -->
+        <dependency>
+            <groupId>com.pi4j</groupId>
+            <artifactId>pi4j-library-linuxfs</artifactId>
+            <version>${project.version}</version>
+            <classifier>armhf</classifier>
+            <type>so</type>
+        </dependency>
+        <dependency>
+            <groupId>com.pi4j</groupId>
+            <artifactId>pi4j-library-linuxfs</artifactId>
+            <version>${project.version}</version>
+            <classifier>aarch64</classifier>
+            <type>so</type>
+        </dependency>
 
     </dependencies>
 
@@ -196,22 +241,22 @@
                     <passphrase>${pi4j.gpg.passphrase}</passphrase>
 
                     <dataSet>
-<!--                        <data>-->
-<!--                            <src>${project.build.directory}/distro-contents/LICENSE.txt</src>-->
-<!--                            <dst>LICENSE</dst>-->
-<!--                            <type>file</type>-->
-<!--                            <dst>/opt/pi4j/LICENSE</dst>-->
-<!--                        </data>-->
-<!--                        <data>-->
-<!--                            <src>${project.build.directory}/distro-contents/NOTICE.txt</src>-->
-<!--                            <type>file</type>-->
-<!--                            <dst>/opt/pi4j/NOTICE</dst>-->
-<!--                        </data>-->
-<!--                        <data>-->
-<!--                            <src>${project.build.directory}/distro-contents/README.md</src>-->
-<!--                            <type>file</type>-->
-<!--                            <dst>/opt/pi4j/README</dst>-->
-<!--                        </data>-->
+                        <!--                        <data>-->
+                        <!--                            <src>${project.build.directory}/distro-contents/LICENSE.txt</src>-->
+                        <!--                            <dst>LICENSE</dst>-->
+                        <!--                            <type>file</type>-->
+                        <!--                            <dst>/opt/pi4j/LICENSE</dst>-->
+                        <!--                        </data>-->
+                        <!--                        <data>-->
+                        <!--                            <src>${project.build.directory}/distro-contents/NOTICE.txt</src>-->
+                        <!--                            <type>file</type>-->
+                        <!--                            <dst>/opt/pi4j/NOTICE</dst>-->
+                        <!--                        </data>-->
+                        <!--                        <data>-->
+                        <!--                            <src>${project.build.directory}/distro-contents/README.md</src>-->
+                        <!--                            <type>file</type>-->
+                        <!--                            <dst>/opt/pi4j/README</dst>-->
+                        <!--                        </data>-->
 
                         <!-- include all meta files (README, LICENSE, etc) -->
                         <data>
@@ -274,7 +319,7 @@
                             <target>
                                 <fixcrlf srcdir="${project.build.directory}/distro-contents"
                                          eol="unix"
-                                         excludes="**/*.jar" />
+                                         excludes="**/*.jar"/>
                             </target>
                         </configuration>
                         <goals>
@@ -293,14 +338,15 @@
                         <configuration>
                             <target>
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties"
-                                         classpathref="maven.plugin.classpath" />
+                                         classpathref="maven.plugin.classpath"/>
                                 <if>
-                                    <equals arg1="${pi4j.dev.transfer}" arg2="true" />
+                                    <equals arg1="${pi4j.dev.transfer}" arg2="true"/>
                                     <then>
                                         <!-- ensure the target directory exists on the Raspberry Pi -->
-                                        <sshexec host="${pi4j.dev.host}" port="${pi4j.dev.port}" username="${pi4j.dev.user}"
+                                        <sshexec host="${pi4j.dev.host}" port="${pi4j.dev.port}"
+                                                 username="${pi4j.dev.user}"
                                                  password="${pi4j.dev.password}" trust="true" failonerror="false"
-                                                 verbose="true" command="mkdir --parents ${pi4j.dev.directory}" />
+                                                 verbose="true" command="mkdir --parents ${pi4j.dev.directory}"/>
 
                                         <!-- copy the DEB file to the Raspberry Pi -->
                                         <scp