skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

libsodium and masterpassword-core must be linked statically + windows build configuration fixes.

Browse Source
This commit is contained in:
Maarten Billemont 2018-06-27 02:54:31 -04:00
parent cc583c789d
commit 0dddcef28e
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bin/build_lib
View File

@ -187,7 +187,7 @@ _target_build() {
if [[ $platform = windows ]]; then if [[ $platform = windows ]]; then
# I cannot for the life of me figure out how to pass this command directly into cmd. # I cannot for the life of me figure out how to pass this command directly into cmd.
printf '"%%VSINSTALLDIR%%\Common7\Tools\VsMSBuildCmd.bat" && msbuild /t:Rebuild /p:Configuration=ReleaseDLL;Platform=%s;OutDir=%s' "$arch" "$(cygpath -w "${prefix##$PWD/}/$arch/")" > .build.bat printf '"%%VSINSTALLDIR%%\Common7\Tools\VsMSBuildCmd.bat" && msbuild /t:Rebuild /p:Configuration=Release;Platform=%s;OutDir=%s' "$arch" "$(cygpath -w "${prefix##$PWD/}/$arch/")" > .build.bat
cmd //c .build.bat cmd //c .build.bat
rm -f .build.bat rm -f .build.bat
else else

48
platform-independent/c/core/build.gradle
View File

@ -12,9 +12,8 @@ artifacts {
'default' task( type: Zip, "archive" ) { 'default' task( type: Zip, "archive" ) {
components.withType( ComponentWithRuntimeFile ) { components.withType( ComponentWithRuntimeFile ) {
if (isOptimized()) { if (isOptimized()) {
from getRuntimeFile() from runtimeFile
into standardOperatingSystem( linkTask.get().targetPlatform.get() ) + '/' + into standardOperatingSystem( targetPlatform ) + '/' + standardArchitecture( targetPlatform )
standardArchitecture( linkTask.get().targetPlatform.get() )
} }
} }
} }
@ -28,12 +27,12 @@ library {
toolChains { toolChains {
withType( VisualCpp ) { withType( VisualCpp ) {
eachPlatform { eachPlatform {
cppCompiler.withArguments { addAll( ["/TC", "/DMPW_SODIUM=1"] ) } cppCompiler.withArguments { addAll( ["/TC", "/MT", "/Ox", "/DMPW_SODIUM=1", "/DSODIUM_STATIC", "/DSODIUM_EXPORT="] ) }
} }
} }
withType( GccCompatibleToolChain ) { withType( GccCompatibleToolChain ) {
eachPlatform { eachPlatform {
cppCompiler.withArguments { addAll( ["-x", "c", "-std=c11", "-Werror", "-DMPW_SODIUM=1"] ) } cppCompiler.withArguments { addAll( ["-x", "c", "-O3", "-std=c11", "-Werror", "-DMPW_SODIUM=1"] ) }
} }
} }
} }
@ -47,30 +46,27 @@ library {
objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ), objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ),
objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS )] ) objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS )] )
publicHeaders {
// Depend on JDK for JNI support.
from files( new File( Jvm.current().javaHome, "include" ) ) { first().eachDir { from it } }
publicHeaders.from files( "$rootDir/../lib/libsodium/src/libsodium/include" )
}
binaries.configureEach { binaries.configureEach {
// Resolve a standard name for the platform. def system = standardOperatingSystem( targetPlatform )
def platform = standardOperatingSystem( targetPlatform )
if (project.tasks.findByName('buildLibSodium') == null) dependencies {
archive.dependsOn task( type: Exec, 'buildLibSodium', { implementation fileTree( "$rootDir/../lib/libsodium/build-${system}~/out/lib" )
commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-${platform}"
} )
// if (project.tasks.findByName('buildLibJson-c') == null)
// archive.dependsOn task( type: Exec, 'buildLibJson-c', {
// commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${platform}"
// } )
project.dependencies {
// Depend on JDK for JNI support.
add( includePathConfiguration.name,
files( new File( Jvm.current().javaHome, "include" ) ) { first().eachDir { from it } } )
// Depend on libsodium from `lib`.
add( includePathConfiguration.name,
files( "../../../lib/libsodium/src/libsodium/include" ) )
add( linkLibraries.name,
fileTree( "../../../lib/libsodium/build-${platform}~/out/lib" ) )
} }
if (project.tasks.findByName('build_libsodium') == null)
archive.dependsOn task( type: Exec, 'build_libsodium', {
commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-${system}"
} )
// if (project.tasks.findByName('build_libjson-c') == null)
// archive.dependsOn task( type: Exec, 'build_libjson-c', {
// commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}"
// } )
} }
} }