diff --git a/.gitignore b/.gitignore index fb1855f99..88dfd43d7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /builds/autoconf/ !/builds/autoconf/m4/m4_ax_pkg_check_modules.m4 /liblcf-*/ -/test_runner* .deps/ .libs/ .dirstamp @@ -15,7 +14,7 @@ config.h.in config.log config.status configure -liblcf-*.tar.gz +liblcf-*.tar.* libtool stamp-h1 *.la @@ -54,4 +53,4 @@ Makefile *.pc # tests -/tests/test_runner* +test_runner* diff --git a/Makefile.am b/Makefile.am index 3a4b72bd8..23387a5de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ ACLOCAL_AMFLAGS = --install -I builds/autoconf/m4 -EXTRA_DIST = AUTHORS.md README.md builds generator +EXTRA_DIST = AUTHORS.md README.md generator \ + builds/cmake builds/vs2015 builds/Doxyfile pkgconfigdir = ${libdir}/pkgconfig pkgconfig_DATA = builds/liblcf.pc @@ -195,6 +196,7 @@ pkginclude_HEADERS = \ check_PROGRAMS = test_runner test_runner_SOURCES = \ + tests/doctest.h \ tests/time_stamp.cpp \ tests/test_main.cpp test_runner_CPPFLAGS = \ diff --git a/README.md b/README.md index 015a0a759..d0882b562 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Documentation is available at the documentation wiki: https://wiki.easyrpg.org ## Requirements Expat for XML reading support. -ICU for character encoding detection and conversion. +ICU for character encoding detection and conversion (recommended). ## Source code @@ -41,8 +41,8 @@ Building requirements: Step-by-step instructions: - tar xf liblcf-0.5.2.tar.xz # unpack the tarball - cd liblcf-0.5.2 # enter in the package directory + tar xf liblcf-0.5.3.tar.xz # unpack the tarball + cd liblcf-0.5.3 # enter in the package directory ./configure --prefix /usr # find libraries, set options make # compile the library sudo make install # install system-wide diff --git a/builds/autoconf/m4/ax_pkg_check_modules.m4 b/builds/autoconf/m4/ax_pkg_check_modules.m4 index f3af0f684..1842a9a8f 100644 --- a/builds/autoconf/m4/ax_pkg_check_modules.m4 +++ b/builds/autoconf/m4/ax_pkg_check_modules.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pkg_check_modules.html +# https://www.gnu.org/software/autoconf-archive/ax_pkg_check_modules.html # =========================================================================== # # SYNOPSIS @@ -50,7 +50,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 2 +#serial 3 AC_DEFUN([AX_PKG_CHECK_MODULES],[ m4_define([ax_package_requires], diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index d6287be13..60311fabd 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) project(liblcf C CXX) -set(PACKAGE_VERSION 0.5.2) +set(PACKAGE_VERSION 0.5.3) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib) diff --git a/configure.ac b/configure.ac index b9ae30aac..1939aff83 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,10 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([liblcf],[0.5.2],[https://github.com/EasyRPG/liblcf/issues],[liblcf],[https://easyrpg.org/]) +AC_INIT([liblcf],[0.5.3],[https://github.com/EasyRPG/liblcf/issues],[liblcf],[https://easyrpg.org/]) AC_CONFIG_AUX_DIR([builds/autoconf]) -AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects -Wall -Werror]) +AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects -Wall dist-xz]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes])