skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix inter-project dependency and including libs into algorithm jar.

Browse Source
This commit is contained in:
Maarten Billemont
2018-05-27 23:43:35 -04:00
parent 0b044ab9a4
commit a0447298d3
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/c/build.gradle
View File

@@ -8,14 +8,14 @@ plugins {
description = 'Master Password Algorithm Implementation'
task archive( type: Zip ) {
dependsOn assemble
components.withType( ComponentWithRuntimeFile ) {
if (isOptimized()) {
from getRuntimeFile()
into standardOperatingSystem( linkTask.get().targetPlatform.get() ) + '/' +
standardArchitecture( linkTask.get().targetPlatform.get() )
artifacts {
'default' task( type: Zip, "archive" ) {
components.withType( ComponentWithRuntimeFile ) {
if (isOptimized()) {
from getRuntimeFile()
into standardOperatingSystem( linkTask.get().targetPlatform.get() ) + '/' +
standardArchitecture( linkTask.get().targetPlatform.get() )
}
}
}
}
@@ -34,7 +34,6 @@ library {
}
}
components.withType( CppComponent ) {
// Reconfigure the toolchain from C++ to C.
cppSource.from fileTree( dir: "src", include: "**/*.c" )
}
@@ -43,6 +42,7 @@ library {
objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ),
objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS )] )
//
binaries.configureEach {
// Resolve a standard name for the platform.
def platform = standardOperatingSystem( targetPlatform )