diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ecd6c2..bb6c3bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) project(InpxCreator) # Project version number set(PRJ_VERSION_MAJOR 6) -set(PRJ_VERSION_MINOR 1) +set(PRJ_VERSION_MINOR 2) configure_file ("${PROJECT_SOURCE_DIR}/cmake/version.h.in" "${PROJECT_BINARY_DIR}/version.h") include_directories("${PROJECT_BINARY_DIR}") @@ -61,7 +61,7 @@ configure_file ("${PROJECT_SOURCE_DIR}/cmake/version.go.in" "${GO_PATH}/src/libg include_directories("${PROJECT_BINARY_DIR}") find_package(Git REQUIRED) -find_package(Go 1.4 REQUIRED) +find_package(Go 1.5 REQUIRED) file(GLOB SRCS_LIBGET2 RELATIVE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/libget2/*.go) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libget2.exe DEPENDS ${SRCS_LIBGET2} "${GO_PATH}/src/libget2/version.go" diff --git a/build_release.sh b/build_release.sh index fd9184f..ef05e48 100644 --- a/build_release.sh +++ b/build_release.sh @@ -3,44 +3,34 @@ # Standard preambule plain() { local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf " ${mesg}\n" "$@" >&2 } print_warning() { local mesg=$1; shift - printf "${YELLOW}=> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${YELLOW}=> WARNING: ${mesg}${ALL_OFF}\n" "$@" >&2 } print_msg1() { local mesg=$1; shift - printf "${GREEN}==> ${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${GREEN}==> ${mesg}${ALL_OFF}\n" "$@" >&2 } print_msg2() { local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BLUE} -> ${mesg}${ALL_OFF}\n" "$@" >&2 } print_error() { local mesg=$1; shift - printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${RED}==> ERROR: ${mesg}${ALL_OFF}\n" "$@" >&2 } -if /usr/bin/tput setaf 0 &>/dev/null; then - ALL_OFF="$(/usr/bin/tput sgr0)" - BOLD="$(/usr/bin/tput bold)" - BLUE="${BOLD}$(/usr/bin/tput setaf 4)" - GREEN="${BOLD}$(/usr/bin/tput setaf 2)" - RED="${BOLD}$(/usr/bin/tput setaf 1)" - YELLOW="${BOLD}$(/usr/bin/tput setaf 3)" -else - ALL_OFF="\e[1;0m" - BOLD="\e[1;1m" - BLUE="${BOLD}\e[1;34m" - GREEN="${BOLD}\e[1;32m" - RED="${BOLD}\e[1;31m" - YELLOW="${BOLD}\e[1;33m" -fi +ALL_OFF='' +BLUE='' +GREEN='' +RED='' +YELLOW='' readonly ALL_OFF BOLD BLUE GREEN RED YELLOW MINGW_INSTALLS="${MINGW_INSTALLS:-mingw64 mingw32}"