2
0

Some build tool updates, primarily cmake.

This commit is contained in:
Maarten Billemont 2017-09-10 13:57:14 -04:00
parent 33bf2c93d0
commit f50fdb7777
4 changed files with 159 additions and 27 deletions

View File

@ -6,20 +6,18 @@
<option name="PM_INSTALL_OPTIONS" value="" /> <option name="PM_INSTALL_OPTIONS" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" /> <option name="MODE" value="default_activity" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="PREFERRED_AVD" value="" /> <option name="PREFERRED_AVD" value="" />
<option name="CLEAR_LOGCAT" value="false" /> <option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" /> <option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="DEBUGGER_TYPE" value="Java" /> <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" /> <option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" /> <option name="PREFERRED_AVD" value="" />
<option name="DEBUGGER_TYPE" value="Java" />
<Java /> <Java />
<Profilers> <Profilers>
<option name="ENABLE_ADVANCED_PROFILING" value="false" /> <option name="ENABLE_ADVANCED_PROFILING" value="false" />
<option name="GAPID_ENABLED" value="false" />
<option name="GAPID_DISABLE_PCS" value="false" />
<option name="SUPPORT_LIB_ENABLED" value="true" /> <option name="SUPPORT_LIB_ENABLED" value="true" />
<option name="INSTRUMENTATION_ENABLED" value="true" /> <option name="INSTRUMENTATION_ENABLED" value="true" />
</Profilers> </Profilers>

View File

@ -22,7 +22,7 @@ buildscript {
} }
dependencies { dependencies {
classpath group: 'com.android.tools.build', name: 'gradle', version: '2.2.3' classpath group: 'com.android.tools.build', name: 'gradle', version: '2.3.0'
} }
} }

View File

@ -1,13 +1,137 @@
project(mpw C) ### CMAKE
cmake_minimum_required(VERSION 3.0.2) project( mpw C )
cmake_minimum_required( VERSION 3.0.2 )
set(CMAKE_BUILD_TYPE Release)
set(CMAKE_C_FLAGS "-O3 -DMPW_SODIUM=1 -DMPW_JSON=1")
include_directories(core cli) ### CONFIGURATION
file(GLOB SOURCES "core/*.c" "cli/mpw-cli*.c") # Features.
add_executable(mpw ${SOURCES}) option( USE_SODIUM "Implement crypto functions with sodium (depends on libsodium)." ON )
option( USE_JSON "Support JSON-based user configuration format (depends on libjson-c)." ON )
option( USE_COLOR "Colorized identicon (depends on libncurses)." ON )
option( USE_XML "XML parsing (depends on libxml2)." ON )
find_library(libsodium REQUIRED) option( BUILD_MPW "C CLI version of Master Password (needs: mpw_sodium, optional: mpw_color, mpw_json)." ON )
find_library(libjson-c REQUIRED) option( BUILD_MPW_BENCH "C CLI Master Password benchmark utility (needs: mpw_sodium)." OFF )
target_link_libraries(mpw sodium json-c) option( BUILD_MPW_TESTS "C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml)." OFF )
# Default build flags.
set( CMAKE_BUILD_TYPE Release )
set( CMAKE_C_FLAGS "-O3" )
# Version.
file( READ "VERSION" mpw_version )
add_definitions( -DMP_VERSION=${VERSION} )
### DEPENDENCIES
function( use_mpw_sodium t r )
if( USE_SODIUM )
target_link_libraries( ${t} sodium )
target_compile_definitions( ${t} PUBLIC -DMPW_SODIUM=1 )
message(STATUS "${t}: USE_SODIUM is enabled.")
elseif( r STREQUAL "required" )
message(FATAL_ERROR "${t}: USE_SODIUM was required but is not enabled. Please enable the option or remove this target.")
else()
message(STATUS "${t}: USE_SODIUM is supported but not enabled.")
endif()
endfunction()
function( use_mpw_color t )
if( USE_COLOR )
target_link_libraries( ${t} curses)
target_compile_definitions( ${t} PUBLIC -DMPW_COLOR=1 )
message(STATUS "${t}: USE_COLOR is enabled.")
elseif( r STREQUAL "required" )
message(FATAL_ERROR "${t}: USE_COLOR was required but is not enabled. Please enable the option or remove this target.")
else()
message(STATUS "${t}: USE_COLOR is supported but not enabled.")
endif()
endfunction()
function( use_mpw_json t )
if( USE_JSON )
target_link_libraries( ${t} json-c)
target_compile_definitions( ${t} PUBLIC -DMPW_JSON=1 )
message(STATUS "${t}: USE_JSON is enabled.")
elseif( r STREQUAL "required" )
message(FATAL_ERROR "${t}: USE_JSON was required but is not enabled. Please enable the option or remove this target.")
else()
message(STATUS "${t}: USE_JSON is supported but not enabled.")
endif()
endfunction()
function( use_mpw_xml t r )
find_package( LIBXML2 )
if( USE_XML )
if ( LIBXML2_FOUND )
target_include_directories( ${t} PUBLIC ${LIBXML2_INCLUDE_DIR} )
target_link_libraries( ${t} ${LIBXML2_LIBRARIES} )
target_compile_definitions( ${t} PUBLIC -DMPW_XML=1 ${LIBXML2_DEFINITIONS} )
message(STATUS "${t}: USE_XML is enabled.")
elseif( r STREQUAL "required" )
message(FATAL_ERROR "${t}: USE_XML was enabled but is missing libxml2. Please install this library before continuing.")
else()
message(WARNING "${t}: USE_XML was enabled but is missing libxml2. Will continue with USE_XML disabled!")
endif()
elseif( r STREQUAL "required" )
message(FATAL_ERROR "${t}: USE_XML was required but is not enabled. Please enable the option or remove this target.")
else()
message(STATUS "${t}: USE_XML is supported but not enabled.")
endif()
endfunction()
### TARGET: MPW
if( BUILD_MPW )
# target
add_executable( mpw "core/base64.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "core/mpw-marshall-util.c" "core/mpw-marshall.c"
"cli/mpw-cli-util.c" "cli/mpw-cli.c" )
target_include_directories( mpw PUBLIC core cli )
# dependencies
use_mpw_sodium( mpw required )
use_mpw_color( mpw optional )
use_mpw_json( mpw optional )
endif()
### TARGET: MPW-BENCH
if( BUILD_MPW_BENCH )
# target
add_executable( mpw_bench "core/base64.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c"
"cli/mpw-bench.c" )
target_include_directories( mpw_bench PUBLIC core cli )
# dependencies
use_mpw_sodium( mpw_bench required )
endif()
### TARGET: MPW-TESTS
if( BUILD_MPW_TESTS )
# target
add_executable( mpw_tests "core/base64.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c"
"cli/mpw-tests-util.c" "cli/mpw-tests.c" )
target_include_directories( mpw_tests PUBLIC core cli )
# dependencies
use_mpw_sodium( mpw_tests required )
use_mpw_xml( mpw_tests required )
endif()
#FEATURE_SUMMARY( WHAT ALL )

View File

@ -107,8 +107,8 @@ mpw-bench() {
### TARGET: MPW-TESTS ### TARGET: MPW-TESTS
mpw-tests() { mpw-tests() {
# dependencies # dependencies
use_mpw_xml required
use_mpw_sodium required use_mpw_sodium required
use_mpw_xml required
# target # target
cflags=( cflags=(
@ -153,19 +153,29 @@ use() {
local option=$1 requisite=$2 lib=$3 local option=$1 requisite=$2 lib=$3
local enabled=${!option} local enabled=${!option}
if (( enabled )) && haslib "$lib"; then if (( enabled )); then
echo >&2 "Enabled $option (lib$lib)." if haslib "$lib"; then
echo >&2 "INFO: Enabled $option (lib$lib)."
ldflags+=( -l"$lib" ) ldflags+=( -l"$lib" )
return 0 return 0
elif [[ $requisite != required ]]; then
echo >&2 "WARNING: $option was enabled but is missing $lib library. Will continue with $option disabled!" elif [[ $requisite == required ]]; then
return 1
elif (( enabled )); then
echo >&2 "ERROR: $option was enabled but is missing $lib library. Please install this library before continuing." echo >&2 "ERROR: $option was enabled but is missing $lib library. Please install this library before continuing."
exit 1 exit 1
else else
echo >&2 "WARNING: $option was enabled but is missing $lib library. Will continue with $option disabled!"
return 1
fi
elif [[ $requisite == required ]]; then
echo >&2 "ERROR: $option was required but is not enabled. Please enable the option or remove this target before continuing." echo >&2 "ERROR: $option was required but is not enabled. Please enable the option or remove this target before continuing."
exit 1 exit 1
else
echo >&2 "INFO: $option is supported but not enabled."
return 1
fi fi
} }
use_mpw_sodium() { use_mpw_sodium() {