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

Commit

Permalink
Relocated native binaries to /META-INF/lib
Browse files Browse the repository at this point in the history
Signed-off-by: Rafael Luis Ibasco <[email protected]>
  • Loading branch information
ribasco committed Apr 30, 2021
1 parent bbe99af commit f1c2147
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ To be able to download snapshots from Sonatype, add the following profile entry
<dependency>
<groupId>com.ibasco.ucgdisplay</groupId>
<artifactId>ucg-display</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</dependency>
</dependencies>
```
Expand All @@ -144,7 +144,7 @@ To be able to download snapshots from Sonatype, add the following profile entry
<dependency>
<groupId>com.ibasco.ucgdisplay</groupId>
<artifactId>ucgd-drivers-glcd</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</dependency>
</dependencies>
```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
package com.ibasco.ucgdisplay.integration;
/*
* Copyright (C) 2021 Universal Character/Graphics display library
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Lesser Public License for more details.
* You should have received a copy of the GNU General Lesser Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
*/

package com.ibasco.ucgdisplay.drivers.glcd;

import com.ibasco.ucgdisplay.common.exceptions.NativeLibraryException;
import com.ibasco.ucgdisplay.drivers.glcd.*;
import com.ibasco.ucgdisplay.drivers.glcd.enums.*;
import com.ibasco.ucgdisplay.drivers.glcd.exceptions.GlcdConfigException;
import static org.junit.jupiter.api.Assertions.*;
Expand Down
17 changes: 9 additions & 8 deletions scripts/build-common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,15 @@

<!-- Target directory properties for native binaries -->
<property name="project.dir.target" value="${project.dir.base}/target"/>
<property name="project.target.dir.linux.x86_32" value="${project.dir.target}/classes/natives/linux_32"/>
<property name="project.target.dir.linux.x86_64" value="${project.dir.target}/classes/natives/linux_64"/>
<property name="project.target.dir.linux.arm32" value="${project.dir.target}/classes/natives/linux_arm"/>
<property name="project.target.dir.linux.arm64" value="${project.dir.target}/classes/natives/linux_arm64"/>
<property name="project.target.dir.win.x86_32" value="${project.dir.target}/classes/natives/windows_32"/>
<property name="project.target.dir.win.x86_64" value="${project.dir.target}/classes/natives/windows_64"/>
<property name="project.target.dir.osx.x86_32" value="${project.dir.target}/classes/natives/osx_32"/>
<property name="project.target.dir.osx.x86_64" value="${project.dir.target}/classes/natives/osx_64"/>
<property name="natives.dir.target" value="${project.dir.target}/classes/META-INF/lib"/>
<property name="project.target.dir.linux.x86_32" value="${natives.dir.target}/linux_32"/>
<property name="project.target.dir.linux.x86_64" value="${natives.dir.target}/linux_64"/>
<property name="project.target.dir.linux.arm32" value="${natives.dir.target}/linux_arm"/>
<property name="project.target.dir.linux.arm64" value="${natives.dir.target}/linux_arm64"/>
<property name="project.target.dir.win.x86_32" value="${natives.dir.target}/windows_32"/>
<property name="project.target.dir.win.x86_64" value="${natives.dir.target}/windows_64"/>
<property name="project.target.dir.osx.x86_32" value="${natives.dir.target}/osx_32"/>
<property name="project.target.dir.osx.x86_64" value="${natives.dir.target}/osx_64"/>

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

0 comments on commit f1c2147

Please sign in to comment.