Skip to content

Commit bb9f9e2

Browse files
authored
Merge pull request #367 from carstene1ns/version-0.6.2
Version 0.6.2
2 parents b773253 + efcec48 commit bb9f9e2

188 files changed

Lines changed: 255 additions & 189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.7)
22
cmake_policy(SET CMP0048 NEW)
33

4-
project(liblcf VERSION 0.6.1 LANGUAGES CXX)
4+
project(liblcf VERSION 0.6.2 LANGUAGES CXX)
55

66
option(BUILD_SHARED_LIBS "Build shared library, disable for building the static library" ON)
77
option(DISABLE_ICU "Disable ICU encoding detection (fallback to iconv, not recommended)" OFF)

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2019 liblcf authors
1+
Copyright (c) 2014-2020 liblcf authors
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Building requirements:
4141

4242
Step-by-step instructions:
4343

44-
tar xf liblcf-0.6.1.tar.xz # unpack the tarball
45-
cd liblcf-0.6.1 # enter in the package directory
44+
tar xf liblcf-0.6.2.tar.xz # unpack the tarball
45+
cd liblcf-0.6.2 # enter in the package directory
4646
./configure --prefix /usr # find libraries, set options
4747
make # compile the library
4848
sudo make install # install system-wide
@@ -71,8 +71,8 @@ Building requirements:
7171

7272
Step-by-step instructions:
7373

74-
tar xf liblcf-0.6.1.tar.xz # unpack the tarball
75-
cd liblcf-0.6.1 # enter in the package directory
74+
tar xf liblcf-0.6.2.tar.xz # unpack the tarball
75+
cd liblcf-0.6.2 # enter in the package directory
7676
cmake . -DCMAKE_BUILD_TYPE=Release # configure project
7777
cmake --build . # compile the library
7878
sudo cmake --build . --target install # install system-wide

builds/release-helper.sh

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/bash
2+
3+
# release-helper.sh - maintainer utility script to change
4+
# the library version and update all copyright dates
5+
# by carstene1ns 2020, released under the MIT license
6+
7+
year=$(date +%Y)
8+
version=$1
9+
10+
if [[ ! -z $version ]]; then
11+
12+
if [[ ! $version =~ ^[0-9]\.[0-9]\.[0-9]$ ]]; then
13+
14+
echo "Invalid version argument. Only digits and dots allowed."
15+
exit 1
16+
17+
fi
18+
19+
echo "Updating Version in:"
20+
21+
echo " CMakeLists.txt"
22+
sed -i "/liblcf VERSION/,1 s/[0-9]\.[0-9]\.[0-9]/$version/" CMakeLists.txt
23+
24+
echo " configure.ac"
25+
sed -i "/AC_INIT/,1 s/[0-9]\.[0-9]\.[0-9]/$version/" configure.ac
26+
27+
echo " README.md"
28+
sed -i "s/\(liblcf-\)[0-9]\.[0-9]\.[0-9]/\1$version/g" README.md
29+
30+
else
31+
32+
echo "No new version argument, only updating copyright years!"
33+
34+
fi
35+
36+
echo "Updating License…"
37+
sed -i "1,1 s/2014-2[0-9][0-9][0-9]/2014-$year/" COPYING
38+
39+
# update copyright years, but filter out external sources
40+
echo "Updating source files…"
41+
42+
find src tests -maxdepth 1 -type f \
43+
-a \( -name "*.h" -o -name "*.cpp" \) \
44+
-a \! \( -name "ini*" -o -name "doctest*" \) \
45+
-exec sed -i "/liblcf\. Copyright/,1 s/2[0-9][0-9][0-9]/$year/" {} +
46+
47+
# updating header for generated source files
48+
grep -q "liblcf\. Copyright.*$year" generator/templates/copyright.tmpl ||
49+
echo " -> You need to run the generator."
50+
sed -i "/liblcf\. Copyright/,1 s/2[0-9][0-9][0-9]/$year/" generator/templates/copyright.tmpl
51+
52+
cat << EOF
53+
54+
If everything is ready and committed, use these commands to publish the git tag:
55+
$ git tag -a (-s) $version -m "Codename \"\fancy codename\""
56+
$ git push (-n) --tags upstream
57+
EOF

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([liblcf],[0.6.1],[https://github.com/EasyRPG/liblcf/issues],[liblcf],[https://easyrpg.org/])
5+
AC_INIT([liblcf],[0.6.2],[https://github.com/EasyRPG/liblcf/issues],[liblcf],[https://easyrpg.org/])
66

77
AC_CONFIG_AUX_DIR([builds/autoconf])
88
AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects -Wall dist-xz])

generator/templates/copyright.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* !!!! GENERATED FILE - DO NOT EDIT !!!!
22
* --------------------------------------
33
*
4-
* This file is part of liblcf. Copyright (c) 2019 liblcf authors.
4+
* This file is part of liblcf. Copyright (c) 2020 liblcf authors.
55
* https://github.com/EasyRPG/liblcf - https://easyrpg.org
66
*
77
* liblcf is Free/Libre Open Source Software, released under the MIT License.

src/command_codes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of liblcf. Copyright (c) 2019 liblcf authors.
2+
* This file is part of liblcf. Copyright (c) 2020 liblcf authors.
33
* https://github.com/EasyRPG/liblcf - https://easyrpg.org
44
*
55
* liblcf is Free/Libre Open Source Software, released under the MIT License.

src/data.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of liblcf. Copyright (c) 2019 liblcf authors.
2+
* This file is part of liblcf. Copyright (c) 2020 liblcf authors.
33
* https://github.com/EasyRPG/liblcf - https://easyrpg.org
44
*
55
* liblcf is Free/Libre Open Source Software, released under the MIT License.

src/data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of liblcf. Copyright (c) 2019 liblcf authors.
2+
* This file is part of liblcf. Copyright (c) 2020 liblcf authors.
33
* https://github.com/EasyRPG/liblcf - https://easyrpg.org
44
*
55
* liblcf is Free/Libre Open Source Software, released under the MIT License.

src/encoder.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* This file is part of liblcf. Copyright (c) 2020 liblcf authors.
3+
* https://github.com/EasyRPG/liblcf - https://easyrpg.org
4+
*
5+
* liblcf is Free/Libre Open Source Software, released under the MIT License.
6+
* For the full copyright and license information, please view the COPYING
7+
* file that was distributed with this source code.
8+
*/
9+
110
#include "lcf_options.h"
211
#include "encoder.h"
312
#include "reader_util.h"

0 commit comments

Comments
 (0)