Skip to content
Permalink
Browse files

regenerate from zproject

  • Loading branch information
sphaero committed Feb 25, 2020
1 parent 3aff5f0 commit de741e7fc95812469a46cb36453cc444f6395884
Showing with 37 additions and 21 deletions.
  1. +15 −9 CMakeLists.txt
  2. +18 −8 builds/cmake/Modules/ClangFormat.cmake
  3. +4 −4 ci_deploy.sh
@@ -521,15 +521,19 @@ IF (ENABLE_DRAFTS)
ENDIF (ENABLE_DRAFTS)


add_custom_target(
copy-selftest-ro ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/src/selftest-ro ${PROJECT_BINARY_DIR}/src/selftest-ro
)
if (NOT TARGET copy-selftest-ro)
add_custom_target(
copy-selftest-ro ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/src/selftest-ro ${PROJECT_BINARY_DIR}/src/selftest-ro
)
endif()

add_custom_target(
make-selftest-rw ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/src/selftest-rw
)
if (NOT TARGET make-selftest-rw)
add_custom_target(
make-selftest-rw ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/src/selftest-rw
)
endif()

set_directory_properties(
PROPERTIES
@@ -556,7 +560,9 @@ include(CTest)
########################################################################
# cleanup
########################################################################
add_custom_target (distclean @echo Cleaning for source distribution)
if (NOT TARGET distclean)
add_custom_target (distclean @echo Cleaning for source distribution)
endif()

set(cmake_generated ${PROJECT_BINARY_DIR}/CMakeCache.txt
${PROJECT_BINARY_DIR}/cmake_install.cmake
@@ -18,10 +18,12 @@ if("${CLANG_FORMAT}" STREQUAL "")
set(CLANG_FORMAT "clang-format")
endif()

add_custom_target(
if (NOT TARGET clang-format)
add_custom_target(
clang-format
COMMAND ${CLANG_FORMAT} -style=file -i ${ALL_SOURCE_FILES}
)
)
endif()

function(JOIN VALUES GLUE OUTPUT)
string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
@@ -30,23 +32,31 @@ endfunction()

configure_file(builds/cmake/clang-format-check.sh.in clang-format-check.sh @ONLY)

add_custom_target(
if (NOT TARGET clang-format-check)
add_custom_target(
clang-format-check
COMMAND chmod +x clang-format-check.sh
COMMAND ./clang-format-check.sh
COMMENT "Checking correct formatting according to .clang-format file using ${CLANG_FORMAT}"
)
)
endif()

add_custom_target(
if (NOT TARGET clang-format-check-CI)
add_custom_target(
clang-format-check-CI
COMMAND chmod +x clang-format-check.sh
COMMAND ./clang-format-check.sh --CI
COMMENT "Checking correct formatting according to .clang-format file using ${CLANG_FORMAT}"
)
)
endif()


add_custom_target(
if (NOT TARGET clang-format-diff)
add_custom_target(
clang-format-diff
COMMAND ${CLANG_FORMAT} -style=file -i ${ALL_SOURCE_FILES}
COMMAND git diff ${ALL_SOURCE_FILES}
COMMENT "Formatting with clang-format (using ${CLANG_FORMAT}) and showing differences with latest commit"
)
)
endif()

@@ -20,10 +20,10 @@ if [ "$BUILD_TYPE" == "default" ]; then
md5sum *.zip *.tar.gz > MD5SUMS
sha1sum *.zip *.tar.gz > SHA1SUMS
cd -
elif [ "$BUILD_TYPE" == "bindings" ] && [ "$BINDING" == "jni" ]; then
( cd bindings/jni && TERM=dumb PKG_CONFIG_PATH=/tmp/lib/pkgconfig ./gradlew clean bintrayUpload )
cp bindings/jni/android/zyre-android.jar zyre-android*.jar
export ZYRE_DEPLOYMENT=zyre-android*.jar
elif [ "$BUILD_TYPE" == "bindings" ] && [ "$BINDING" == "jni" ] && [ -z "$BINDING_OPTS" ]; then
( cd bindings/jni && TERM=dumb ./gradlew clean bintrayUpload -PisRelease -PbuildPrefix=/tmp/jni_build )
elif [ "$BUILD_TYPE" == "bindings" ] && [ "$BINDING" == "jni" ] && [ "$BINDING_OPTS" == "android" ]; then
export ZYRE_DEPLOYMENT=bindings/jni/zyre-jni/android/zyre-android-*.jar
else
export ZYRE_DEPLOYMENT=""
fi

0 comments on commit de741e7

Please sign in to comment.
You can’t perform that action at this time.