Skip to content
This repository was archived by the owner on Jul 1, 2024. It is now read-only.

Commit f1c2147

Browse files
committed
Relocated native binaries to /META-INF/lib
Signed-off-by: Rafael Luis Ibasco <ribasco@gmail.com>
1 parent bbe99af commit f1c2147

3 files changed

Lines changed: 27 additions & 12 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ To be able to download snapshots from Sonatype, add the following profile entry
129129
<dependency>
130130
<groupId>com.ibasco.ucgdisplay</groupId>
131131
<artifactId>ucg-display</artifactId>
132-
<version>3.0.0</version>
132+
<version>3.0.1</version>
133133
</dependency>
134134
</dependencies>
135135
```
@@ -144,7 +144,7 @@ To be able to download snapshots from Sonatype, add the following profile entry
144144
<dependency>
145145
<groupId>com.ibasco.ucgdisplay</groupId>
146146
<artifactId>ucgd-drivers-glcd</artifactId>
147-
<version>3.0.0</version>
147+
<version>3.0.1</version>
148148
</dependency>
149149
</dependencies>
150150
```

drivers/glcd/src/it/java/com/ibasco/ucgdisplay/integration/GlcdDriverIT.java renamed to drivers/glcd/src/it/java/com/ibasco/ucgdisplay/drivers/glcd/GlcdDriverIT.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
package com.ibasco.ucgdisplay.integration;
1+
/*
2+
* Copyright (C) 2021 Universal Character/Graphics display library
3+
* This program is free software: you can redistribute it and/or modify
4+
* it under the terms of the GNU Lesser General Public License as
5+
* published by the Free Software Foundation, either version 3 of the
6+
* License, or (at your option) any later version.
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Lesser Public License for more details.
11+
* You should have received a copy of the GNU General Lesser Public
12+
* License along with this program. If not, see
13+
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
14+
*/
15+
16+
package com.ibasco.ucgdisplay.drivers.glcd;
217

318
import com.ibasco.ucgdisplay.common.exceptions.NativeLibraryException;
4-
import com.ibasco.ucgdisplay.drivers.glcd.*;
519
import com.ibasco.ucgdisplay.drivers.glcd.enums.*;
620
import com.ibasco.ucgdisplay.drivers.glcd.exceptions.GlcdConfigException;
721
import static org.junit.jupiter.api.Assertions.*;

scripts/build-common.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,15 @@
113113

114114
<!-- Target directory properties for native binaries -->
115115
<property name="project.dir.target" value="${project.dir.base}/target"/>
116-
<property name="project.target.dir.linux.x86_32" value="${project.dir.target}/classes/natives/linux_32"/>
117-
<property name="project.target.dir.linux.x86_64" value="${project.dir.target}/classes/natives/linux_64"/>
118-
<property name="project.target.dir.linux.arm32" value="${project.dir.target}/classes/natives/linux_arm"/>
119-
<property name="project.target.dir.linux.arm64" value="${project.dir.target}/classes/natives/linux_arm64"/>
120-
<property name="project.target.dir.win.x86_32" value="${project.dir.target}/classes/natives/windows_32"/>
121-
<property name="project.target.dir.win.x86_64" value="${project.dir.target}/classes/natives/windows_64"/>
122-
<property name="project.target.dir.osx.x86_32" value="${project.dir.target}/classes/natives/osx_32"/>
123-
<property name="project.target.dir.osx.x86_64" value="${project.dir.target}/classes/natives/osx_64"/>
116+
<property name="natives.dir.target" value="${project.dir.target}/classes/META-INF/lib"/>
117+
<property name="project.target.dir.linux.x86_32" value="${natives.dir.target}/linux_32"/>
118+
<property name="project.target.dir.linux.x86_64" value="${natives.dir.target}/linux_64"/>
119+
<property name="project.target.dir.linux.arm32" value="${natives.dir.target}/linux_arm"/>
120+
<property name="project.target.dir.linux.arm64" value="${natives.dir.target}/linux_arm64"/>
121+
<property name="project.target.dir.win.x86_32" value="${natives.dir.target}/windows_32"/>
122+
<property name="project.target.dir.win.x86_64" value="${natives.dir.target}/windows_64"/>
123+
<property name="project.target.dir.osx.x86_32" value="${natives.dir.target}/osx_32"/>
124+
<property name="project.target.dir.osx.x86_64" value="${natives.dir.target}/osx_64"/>
124125

125126
<property name="cpp.proj.dir" value="${project.dir.base}/src/main/cpp"/>
126127
<property name="cmake.module.dir" value="${project.dir.root}/native/cmake"/>

0 commit comments

Comments
 (0)