]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: don't transform binary files with sed
authorDaiki Ueno <ueno@gnu.org>
Thu, 20 Aug 2015 00:09:58 +0000 (09:09 +0900)
committerDaiki Ueno <ueno@gnu.org>
Wed, 26 Aug 2015 02:18:21 +0000 (11:18 +0900)
* gnulib-tool (func_add_or_update): Don't apply sed_transform_* to
.mo and .class files.
Reported by Denis Denisov.

ChangeLog
gnulib-tool

index 6f984057f811f1ea6e6fbb6c12ef97d19e49abf8..738490073509c225282d50c538431e9f5921e2e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-20  Daiki Ueno  <ueno@gnu.org>
+
+       gnulib-tool: don't transform binary files with sed
+       * gnulib-tool (func_add_or_update): Don't apply sed_transform_* to
+       .mo and .class files.
+       Reported by Denis Denisov.
+
 2015-08-10  Daiki Ueno  <ueno@gnu.org>
 
        gperf: respect silent rules
index ec82f35ef8de17d82527e1edb02012d7aafc62c4..cd224ad4bcf4fbacaab5bbdce059aad7c1d7e478 100755 (executable)
@@ -4701,10 +4701,15 @@ s,^\(.................................................[^ ]*\) *,
     case "$f" in
       tests=lib/*) f=`echo "$f" | sed -e 's,^tests=lib/,lib/,'` ;;
     esac
+    is_binary_file=
+    case "$f" in
+      *.class | *.mo ) is_binary_file=true ;;
+    esac
     func_dest_tmpfilename "$g"
     func_lookup_file "$f"
     cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed"
-    if test -n "$sed_transform_main_lib_file"; then
+    if test -n "$sed_transform_main_lib_file" \
+       && test -z "$is_binary_file"; then
       case "$of" in
         lib/*)
           sed -e "$sed_transform_main_lib_file" \
@@ -4712,7 +4717,8 @@ s,^\(.................................................[^ ]*\) *,
           ;;
       esac
     fi
-    if test -n "$sed_transform_build_aux_file"; then
+    if test -n "$sed_transform_build_aux_file" \
+       && test -z "$is_binary_file"; then
       case "$of" in
         build-aux/*)
           sed -e "$sed_transform_build_aux_file" \
@@ -4720,7 +4726,8 @@ s,^\(.................................................[^ ]*\) *,
           ;;
       esac
     fi
-    if test -n "$sed_transform_testsrelated_lib_file"; then
+    if test -n "$sed_transform_testsrelated_lib_file" \
+       && test -z "$is_binary_file"; then
       case "$of" in
         tests=lib/*)
           sed -e "$sed_transform_testsrelated_lib_file" \