Java relocation.
This commit is contained in:
parent
aef8422102
commit
190a241a25
@ -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' )
|
||||
|
@ -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" ) )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1 +0,0 @@
|
||||
../../../../../../c/cli/mpw_tests.xml
|
1
platform-independent/java/tests/src/main/resources/mpw_tests.xml
Symbolic link
1
platform-independent/java/tests/src/main/resources/mpw_tests.xml
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../c/cli/mpw_tests.xml
|
Loading…
Reference in New Issue
Block a user