2
0

Java relocation.

This commit is contained in:
Maarten Billemont 2018-06-05 20:19:10 -04:00
parent aef8422102
commit 190a241a25
57 changed files with 5 additions and 5 deletions

View File

@ -10,7 +10,7 @@ include 'masterpassword-core'
project(':masterpassword-core').projectDir = new File( '../platform-independent/c/core' )
include 'masterpassword-algorithm'
project(':masterpassword-algorithm').projectDir = new File( '../platform-independent/java/core' )
project(':masterpassword-algorithm').projectDir = new File( '../platform-independent/java/algorithm' )
include 'masterpassword-model'
project(':masterpassword-model').projectDir = new File( '../platform-independent/java/model' )

View File

@ -52,11 +52,11 @@ library {
add( includePathConfiguration.name,
files( new File( Jvm.current().javaHome, "include" ) ) { first().eachDir { from it } } )
// Depend on libsodium from `lib`; run `lib/bin/build_libsodium-${os}` first.
// Depend on libsodium from `lib`; run `lib/bin/build_libsodium-${platform}` first.
add( includePathConfiguration.name,
files( "../../lib/libsodium/build-${platform}~/out/include" ) )
files( "../../../lib/libsodium/build-${platform}~/out/include" ) )
add( linkLibraries.name,
fileTree( "../../lib/libsodium/build-${platform}~/out/lib" ) )
fileTree( "../../../lib/libsodium/build-${platform}~/out/lib" ) )
}
}
}

View File

@ -1 +0,0 @@
../../../../../../c/cli/mpw_tests.xml

View File

@ -0,0 +1 @@
../../../../../c/cli/mpw_tests.xml