Skip to content

Commit

Permalink
Switching to go 1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rupor-github committed Sep 13, 2015
1 parent 7c313fb commit c284592
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 22 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down Expand Up @@ -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"
Expand Down
30 changes: 10 additions & 20 deletions build_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit c284592

Please sign in to comment.