Skip to content

Commit

Permalink
* Add presets for jnijavacpp and javacpp-platform artifact to fi…
Browse files Browse the repository at this point in the history
…x issues at load time (issue bytedeco/javacv#1305)
  • Loading branch information
saudet committed Mar 29, 2020
1 parent ce1c2d9 commit abe3cf0
Show file tree
Hide file tree
Showing 27 changed files with 1,917 additions and 58 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ jobs:
cd $TRAVIS_BUILD_DIR;
yum -q -y install centos-release-scl-rh epel-release;
yum -q -y install devtoolset-7 java-1.8.0-openjdk-devel wget unzip tar bzip2 gzip xz;
rpm -qa | sed s/.x86_64$/.i686/ | xargs yum -q -y install
find /var/cache/yum/ -name *.rpm | xargs rpm -i --force
wget --no-directories --no-parent --no-verbose -r https://www.repo.cloudlinux.com/cloudlinux/6/sclo/devtoolset-7/i386/ -P $HOME;
rpm -i --force --nodeps $HOME/*.rpm;
source scl_source enable devtoolset-7;
Expand All @@ -69,6 +71,7 @@ jobs:
gpg --version;
mvn clean $MAVEN_PHASE -B -V -U -s $HOME/settings.xml -Djavacpp.platform=linux-x86 -Dmaven.javadoc.skip -Dmaven.test.skip -Dinvoker.skip;
mvn clean $MAVEN_PHASE -B -V -U -s $HOME/settings.xml -Djavacpp.platform=linux-x86_64;
mvn clean $MAVEN_PHASE -B -V -U -s $HOME/settings.xml -f platform/pom.xml -Djavacpp.platform.host;
"
- os: osx
osx_image: xcode9.3
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Add presets for `jnijavacpp` and `javacpp-platform` artifact to fix issues at load time ([issue bytedeco/javacv#1305](https://github.com/bytedeco/javacv/issues/1305))
* Prevent potential `NullPointerException` in `Loader.checkVersion()` ([pull #385](https://github.com/bytedeco/javacpp/pull/385))
* Allow using `Charset` to avoid `UnsupportedEncodingException` from `BytePointer` ([pull #384](https://github.com/bytedeco/javacpp/pull/384))
* Add static `Pointer.isNull(Pointer p)` helper method, for convenience
Expand Down
Loading

0 comments on commit abe3cf0

Please sign in to comment.