Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sun, 13 Nov 2016 17:15:45 UTC
Commit: 5241f40dcfe2bf2287c0f81b7b4bbc463873f775
https://github.com/geany/geany/commit/5241f40dcfe2bf2287c0f81b7b4bbc463873f…
Log Message:
-----------
Add a script to convert NEWS to GitHub release format
Modified Paths:
--------------
scripts/github-news
Modified: scripts/github-news
22 lines changed, 22 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Converts the last NEWS entry to GitHub format
+
+sed -n -e '
+n
+:next
+
+# stop at the second header
+/^[A-Za-z0-9_-]/q
+# strip the leading indentation
+s/^ //
+# Make titles
+s/^[A-Za-z0-9_-]/## \0/
+# Turn PR and Issue references to links
+s%PR#\([0-9]\{1,\}\)%[\0](https://github.com/geany/geany/pull/\1)%g
+s%Issue#\([0-9]\{1,\}\)%[\0](https://github.com/geany/geany/issue/\1)%g
+
+p
+n
+b next
+' < NEWS
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 13 Nov 2016 15:35:36 UTC
Commit: e3b74214771bd3de920d44a8001aa08d4857d774
https://github.com/geany/geany/commit/e3b74214771bd3de920d44a8001aa08d4857d…
Log Message:
-----------
Update NEWS for Windows related changes
Modified Paths:
--------------
NEWS
Modified: NEWS
11 lines changed, 11 insertions(+), 0 deletions(-)
===================================================================
@@ -42,6 +42,17 @@ Geany 1.29 (unreleased)
* Split Window: Work around a GTK bug present from 3.15.9 to 3.21.4
that breaks the document selection popup (Issue#1149, PR#1272).
+ Windows
+ * Include 'grep.exe' from MSYS2 which works better than the previously
+ self-compiled version
+ (Issue#783, Issue#784, Issue#1229, Issue#1260, PR#1301).
+ * Fix executing external commands (mainly Build and Run commands)
+ where paths and filenames with non-ASCII characters are involved
+ (Issue#1076, Issue#1259, Issue#1278, PR#1095).
+ * Do not create a batch file on Run commands any longer, instead use
+ a re-usable script and so eliminate the need to delete the script
+ from itself (Issue#1276, PR#1095).
+
Geany 1.28 (July 10, 2016)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: GitHub <noreply(a)github.com>
Date: Sun, 13 Nov 2016 15:12:59 UTC
Commit: 156c64b36cb0bed389c457629d5d5aad3ee845c0
https://github.com/geany/geany/commit/156c64b36cb0bed389c457629d5d5aad3ee84…
Log Message:
-----------
Merge pull request #1301 from eht16/issue1229_win_grep_from_msys2
Use pre-compiled 'grep' binary from MSYS2 on Windows
Modified Paths:
--------------
scripts/gtk-bundle-from-msys2.sh
Modified: scripts/gtk-bundle-from-msys2.sh
46 lines changed, 26 insertions(+), 20 deletions(-)
===================================================================
@@ -13,7 +13,9 @@ gtkv="3"
run_pi="y"
UNX_UTILS_URL="http://unxutils.sourceforge.net/UnxUpdates.zip"
-GREP_URL="https://download.geany.org/contrib/grep-2.23.tar.xz"
+# path to an installation of a MSYS2 installation in the native architecture matching $ABI
+# leave empty if the script is called already from the same MSYS2 architecture as $ABI
+MSYS2_ABI_PATH="/c/msys32"
package_urls=""
gtk2_dependency_pkgs=""
@@ -205,21 +207,22 @@ cleanup_unnecessary_files() {
find . -type d -empty -delete
}
-download_and_compile_grep() {
- grep_archive="grep_source.tar.xz"
- grep_build_dir="grep_build"
- grep_build_log="grep_build.log"
- echo "Download and compile 'grep' (see ${grep_build_dir}/${grep_build_log} for details)"
- mkdir ${grep_build_dir}
- cd ${grep_build_dir}
- wget --no-verbose -O ${grep_archive} ${GREP_URL}
- tar xf ${grep_archive}
- grep-2*/configure > ${grep_build_log} 2>&1 || exit 1
- make >> ${grep_build_log} 2>&1 || exit 1
- strip src/grep.exe
- cp src/grep.exe ../bin/
- cd ..
- rm -rf ${grep_build_dir}
+copy_grep_and_dependencies() {
+ own_arch=$(arch)
+ if [ "${own_arch}" == "${ABI}" -o -z "${MSYS2_ABI_PATH}" ]; then
+ bin_dir="/usr/bin"
+ else
+ # TODO extract grep and dependencies from Pacman packages according to the target ABI
+ bin_dir="${MSYS2_ABI_PATH}/usr/bin"
+ fi
+ echo "Copy 'grep' from ${bin_dir}"
+ cp "${bin_dir}/grep.exe" "bin/"
+ # dependencies for grep.exe
+ cp "${bin_dir}/msys-2.0.dll" "bin/"
+ cp "${bin_dir}/msys-gcc_s-1.dll" "bin/"
+ cp "${bin_dir}/msys-iconv-2.dll" "bin/"
+ cp "${bin_dir}/msys-intl-8.dll" "bin/"
+ cp "${bin_dir}/msys-pcre-1.dll" "bin/"
}
download_and_extract_sort() {
@@ -232,6 +235,8 @@ download_and_extract_sort() {
}
create_bundle_dependency_info_file() {
+ grep_version="$(bin/grep --version | head -n1)"
+ sort_version="$(bin/sort --version | head -n1)"
filename="ReadMe.Dependencies.Geany.txt"
cat << EOF > "${filename}"
This installation contains dependencies for Geany which are distributed
@@ -242,10 +247,11 @@ full download URL as used to create this installation.
sort.exe is extracted from the ZIP archive at
${UNX_UTILS_URL}.
+Sort version: ${sort_version}
-grep.exe is self-compiled from the sources available at
-${GREP_URL}.
-Used command to compile: ./configure && make
+grep.exe is taken from a 32bit MSYS2 installation and
+is bundled together with its dependencies.
+Grep version: ${grep_version}
Other dependencies are provided by the MSYS2 project
(https://msys2.github.io) and were downloaded from:
@@ -271,7 +277,7 @@ initialize
extract_packages
move_extracted_files
cleanup_unnecessary_files
-download_and_compile_grep
+copy_grep_and_dependencies
download_and_extract_sort
create_bundle_dependency_info_file
create_zip_archive
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).