From 80293c2447610a54ca99026d7d6a9ede15fe0d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 17 Oct 2015 14:30:10 +0200 Subject: core: rename "build-scripts" directory to "tools" --- .travis.yml | 2 +- CMakeLists.txt | 2 +- Makefile.am | 6 ++-- build-scripts/build.sh | 83 ------------------------------------------ build-scripts/git-version.sh | 74 -------------------------------------- tools/build.sh | 85 ++++++++++++++++++++++++++++++++++++++++++++ tools/git-version.sh | 74 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 164 insertions(+), 162 deletions(-) delete mode 100755 build-scripts/build.sh delete mode 100755 build-scripts/git-version.sh create mode 100755 tools/build.sh create mode 100755 tools/git-version.sh diff --git a/.travis.yml b/.travis.yml index c72e118f9..c5078d386 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: - sudo pip install msgcheck pylint script: - - ./build-scripts/build.sh + - ./tools/build.sh - msgcheck po/*.po - pylint doc/docgen.py diff --git a/CMakeLists.txt b/CMakeLists.txt index d8704a195..3b9738a49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,7 +222,7 @@ configure_file(config.h.cmake config.h @ONLY) # set the git version in "config-git.h" add_custom_target(version_git ALL - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build-scripts/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h" + COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") configure_file( diff --git a/Makefile.am b/Makefile.am index ea6451093..634ea97cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ # (if needed, and only for a devel/rc version). BUILT_SOURCES = build-config-git.h build-config-git.h: - -$(abs_top_srcdir)/build-scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h + -$(abs_top_srcdir)/tools/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h if TESTS tests_dir = tests @@ -64,8 +64,8 @@ EXTRA_DIST = AUTHORS.asciidoc \ cmake/cmake_uninstall.cmake.in \ po/CMakeLists.txt \ po/srcfiles.cmake \ - build-scripts/build.sh \ - build-scripts/git-version.sh \ + tools/build.sh \ + tools/git-version.sh \ weechat.png \ weechat.pc.in \ weechat.cygport.in diff --git a/build-scripts/build.sh b/build-scripts/build.sh deleted file mode 100755 index 7a605adaf..000000000 --- a/build-scripts/build.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014-2015 Sébastien Helleu -# -# This file is part of WeeChat, the extensible chat client. -# -# WeeChat is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# WeeChat is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with WeeChat. If not, see . -# - -# -# Build WeeChat with CMake or autotools, according to environment variable -# $BUILDTOOL or first script argument (if given). -# The optional variable $BUILDARGS can be set with arguments for cmake or -# configure commands. -# -# Syntax to run the script with environment variables: -# BUILDTOOL=cmake|autotools ./build.sh -# BUILDTOOL=cmake|autotools BUILDARGS="arguments" ./build.sh -# -# Syntax to run the script with arguments on command line: -# ./build.sh cmake|autotools -# ./build.sh cmake|autotools arguments -# -# This script is used to build WeeChat in Travis CI environment. -# - -run () -{ - echo "Running \"$@\"..." - eval $@ - if [ $? -ne 0 ]; then - echo "ERROR" - exit 1 - fi -} - -BUILDDIR="build-tmp-$$" - -if [ $# -ge 1 ]; then - BUILDTOOL="$1" - shift -fi - -if [ $# -ge 1 ]; then - BUILDARGS="$*" -fi - -if [ -z "$BUILDTOOL" ]; then - echo "Syntax: $0 cmake|autotools" - exit 1 -fi - -# create build directory -run "mkdir $BUILDDIR" -run "cd $BUILDDIR" - -if [ "$BUILDTOOL" = "cmake" ]; then - # build with CMake - run "cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}" - run "make VERBOSE=1 -j$(nproc)" - run "sudo make install" - run "ctest -V" -fi - -if [ "$BUILDTOOL" = "autotools" ]; then - # build with autotools - run "../autogen.sh" - run "../configure --enable-man --enable-doc --enable-tests ${BUILDARGS}" - run "make -j$(nproc)" - run "sudo make install" - run "./tests/tests -v" -fi diff --git a/build-scripts/git-version.sh b/build-scripts/git-version.sh deleted file mode 100755 index c1a8fada3..000000000 --- a/build-scripts/git-version.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2003-2015 Sébastien Helleu -# -# This file is part of WeeChat, the extensible chat client. -# -# WeeChat is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# WeeChat is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with WeeChat. If not, see . -# - -# -# Updates git version in config-git.h if the output of "git describe" has changed. -# -# Syntax: -# git-version.sh -# -# rootdir : root directory with WeeChat files (to search .git/ directory) -# version : WeeChat version, for example 0.3.9 or 0.4.0-dev -# headerfile: file to update, for example config-git.h -# - -if [ $# -lt 3 ]; then - echo "Syntax: $0 " - exit 1 -fi - -ROOTDIR=$1 -VERSION=$2 -HEADERFILE=$3 - -# debug: -#echo "pwd=$PWD, rootdir=$ROOTDIR, version=$VERSION, headerfile=$HEADERFILE" - -# read git version if we are in a devel/rc version and if we are in a repository -GIT_VERSION="" -case ${VERSION} in -*-*) - # devel/rc version (like 0.4.0-dev or 0.4.0-rc1) - if [ -d "${ROOTDIR}/.git" ]; then - GIT_VERSION=$(cd ${ROOTDIR} && git describe 2>/dev/null) - fi - ;; -*) - # stable version => no git version - ;; -esac - -# check if git version has changed -if [ ! -f ${HEADERFILE} ]; then - # header does not exist => create it - echo "Creating file ${HEADERFILE} with git version: \"${GIT_VERSION}\"" - echo "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" >${HEADERFILE} -else - grep -q "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" ${HEADERFILE} - if [ $? -eq 0 ]; then - # git version matches the file => NO update - echo "File ${HEADERFILE} is up-to-date (git version: \"${GIT_VERSION}\")" - else - # git version not found in file => update file with this git version - echo "Updating file ${HEADERFILE} with git version: \"${GIT_VERSION}\"" - sed "s/#define PACKAGE_VERSION_GIT \".*\"/#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"/" ${HEADERFILE} >${HEADERFILE}.tmp - mv -f ${HEADERFILE}.tmp ${HEADERFILE} - fi -fi diff --git a/tools/build.sh b/tools/build.sh new file mode 100755 index 000000000..9c8f8db58 --- /dev/null +++ b/tools/build.sh @@ -0,0 +1,85 @@ +#!/bin/sh +# +# Copyright (C) 2014-2015 Sébastien Helleu +# +# This file is part of WeeChat, the extensible chat client. +# +# WeeChat is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# WeeChat is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with WeeChat. If not, see . +# + +# +# Build WeeChat with CMake or autotools, according to environment variable +# $BUILDTOOL or first script argument (if given). +# The optional variable $BUILDARGS can be set with arguments for cmake or +# configure commands. +# +# Syntax to run the script with environment variables: +# BUILDTOOL=cmake ./build.sh +# BUILDTOOL=autotools ./build.sh +# BUILDTOOL=cmake BUILDARGS="arguments" ./build.sh +# BUILDTOOL=autotools BUILDARGS="arguments" ./build.sh +# +# Syntax to run the script with arguments on command line: +# ./build.sh cmake [arguments] +# ./build.sh autotools [arguments] +# +# This script is used to build WeeChat in Travis CI environment. +# + +run () +{ + echo "Running \"$@\"..." + eval $@ + if [ $? -ne 0 ]; then + echo "ERROR" + exit 1 + fi +} + +BUILDDIR="build-tmp-$$" + +if [ $# -ge 1 ]; then + BUILDTOOL="$1" + shift +fi + +if [ $# -ge 1 ]; then + BUILDARGS="$*" +fi + +if [ -z "$BUILDTOOL" ]; then + echo "Syntax: $0 cmake|autotools" + exit 1 +fi + +# create build directory +run "mkdir $BUILDDIR" +run "cd $BUILDDIR" + +if [ "$BUILDTOOL" = "cmake" ]; then + # build with CMake + run "cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}" + run "make VERBOSE=1 -j$(nproc)" + run "sudo make install" + run "ctest -V" +fi + +if [ "$BUILDTOOL" = "autotools" ]; then + # build with autotools + run "../autogen.sh" + run "../configure --enable-man --enable-doc --enable-tests ${BUILDARGS}" + run "make -j$(nproc)" + run "sudo make install" + run "./tests/tests -v" +fi diff --git a/tools/git-version.sh b/tools/git-version.sh new file mode 100755 index 000000000..c1a8fada3 --- /dev/null +++ b/tools/git-version.sh @@ -0,0 +1,74 @@ +#!/bin/sh +# +# Copyright (C) 2003-2015 Sébastien Helleu +# +# This file is part of WeeChat, the extensible chat client. +# +# WeeChat is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# WeeChat is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with WeeChat. If not, see . +# + +# +# Updates git version in config-git.h if the output of "git describe" has changed. +# +# Syntax: +# git-version.sh +# +# rootdir : root directory with WeeChat files (to search .git/ directory) +# version : WeeChat version, for example 0.3.9 or 0.4.0-dev +# headerfile: file to update, for example config-git.h +# + +if [ $# -lt 3 ]; then + echo "Syntax: $0 " + exit 1 +fi + +ROOTDIR=$1 +VERSION=$2 +HEADERFILE=$3 + +# debug: +#echo "pwd=$PWD, rootdir=$ROOTDIR, version=$VERSION, headerfile=$HEADERFILE" + +# read git version if we are in a devel/rc version and if we are in a repository +GIT_VERSION="" +case ${VERSION} in +*-*) + # devel/rc version (like 0.4.0-dev or 0.4.0-rc1) + if [ -d "${ROOTDIR}/.git" ]; then + GIT_VERSION=$(cd ${ROOTDIR} && git describe 2>/dev/null) + fi + ;; +*) + # stable version => no git version + ;; +esac + +# check if git version has changed +if [ ! -f ${HEADERFILE} ]; then + # header does not exist => create it + echo "Creating file ${HEADERFILE} with git version: \"${GIT_VERSION}\"" + echo "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" >${HEADERFILE} +else + grep -q "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" ${HEADERFILE} + if [ $? -eq 0 ]; then + # git version matches the file => NO update + echo "File ${HEADERFILE} is up-to-date (git version: \"${GIT_VERSION}\")" + else + # git version not found in file => update file with this git version + echo "Updating file ${HEADERFILE} with git version: \"${GIT_VERSION}\"" + sed "s/#define PACKAGE_VERSION_GIT \".*\"/#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"/" ${HEADERFILE} >${HEADERFILE}.tmp + mv -f ${HEADERFILE}.tmp ${HEADERFILE} + fi +fi -- cgit v1.2.3