[jhbuild] install-check: Drop as no longer useful and potentially dangerous

[Emanuele Aina <emaaa src gnome org>]

commit 18aaf92d8e6e18b293ecd6fa3506c466786e82e5
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Mon Nov 9 23:07:17 2015 +0000

    install-check: Drop as no longer useful and potentially dangerous
    
    `install-check` is totally pointless when installing to a DESTDIR and
    copying the files into place, which nowadays is JHBuild's normal method
    of operation.
    
    It's also potentially problematic when mixed with .pyc files in the case
    that we don't do a DESTDIR install (for some reason).  The .pyc file can
    be updated (due to the fact that it contains a timestamp) and will
    therefore be installed, but the original .py file wouldn't be because
    it's the same.  This means that the timestamp in the .pyc file would
    mismatch the installed .py file (which would either be equal to the
    timestamp that it was checked out of git, or that it was generated, if
    that is the case).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=721167

 .gitignore                 |    1 -
 Makefile.am                |    6 --
 Makefile.plain             |    9 +---
 Makefile.windows           |    3 -
 doc/C/index.docbook        |    5 +--
 install-check.c            |  126 --------------------------------------------
 install-check.sh           |    2 -
 jhbuild/defaults.jhbuildrc |    9 +---
 8 files changed, 5 insertions(+), 156 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7fde771..a434114 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ mo/
 /doc/*/.xml2po.mo
 /examples/jhbuild.desktop
 /gnome-doc-utils.make
-/install-check
 /install-sh
 /intltool-extract.in
 /intltool-merge.in
diff --git a/Makefile.am b/Makefile.am
index 4c506da..612007d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ INTLTOOL =                    \
 
 EXTRA_DIST = $(PATCHES) $(MODULESETS) $(DTDS) \
        modulesets/moduleset.xsl \
-       install-check.c \
        autogen.sh \
        $(desktop_in_files) $(INTLTOOL)
 
@@ -36,11 +35,6 @@ DISTCLEANFILES =             \
 CLEANFILES = \
        $(desktop_DATA)
 
-bin_PROGRAMS = install-check
-
-install_check_SOURCES = install-check.c
-
-
 install-exec-local:
        $(srcdir)/scripts/debian-python2-postinstall-hook.sh $(DESTDIR)$(bindir)
 
diff --git a/Makefile.plain b/Makefile.plain
index 5bed1b0..316725d 100644
--- a/Makefile.plain
+++ b/Makefile.plain
@@ -8,21 +8,18 @@ MAKE ?= make
 
 -include Makefile.inc
 
-all: include-check install-check
+all: include-check
        @echo 'Run "make install" to install.'
 
 include-check:
        @test -f Makefile.inc || \
        (echo "Makefile.inc doesn't exist. Please run autogen.sh"; exit 1)
 
-install-check: install-check.c
-       $(CC) $(CFLAGS) -o install-check install-check.c
-
 update:
        git pull --rebase
        @if [ "x$(DISABLE_GETTEXT)" = x ]; then (cd po && $(MAKE) -f Makefile.plain); fi
 
-install: include-check install-check
+install: include-check
        @if [ "x$(DISABLE_GETTEXT)" = x ]; then (cd po && $(MAKE) -f Makefile.plain install); fi
        @echo "Creating $(bindir)/jhbuild"
        @mkdir -p $(bindir)
@@ -36,8 +33,6 @@ install: include-check install-check
        @sed "s,^_,,g;s,^Exec=.*$$,Exec=$(bindir)/jhbuild gui,;s,^X-GNOME-Bugzilla-Version=.*$$,," \
                < jhbuild.desktop.in.in > $(desktopdir)/jhbuild.desktop
 
-       install -m755 install-check $(bindir)/install-check
-
 # if ~/bin/jbuild exists, it is most likely an old version, and it will
 # not work; so rename it and install a symlink to the new version
 # instead.
diff --git a/Makefile.windows b/Makefile.windows
index eaa4920..6ec7878 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -26,9 +26,6 @@ install: include-check
                scripts/jhbuild.in > $(bindir)/jhbuild
        @chmod a+x $(bindir)/jhbuild
 
-       @cp install-check.sh $(bindir)/install-check
-       @chmod a+x $(bindir)/install-check
-
 #       if ~/bin/jbuild exists, it is most likely an old version, and it will
 #       not work; so rename it and install a symlink to the new version
 #       instead.
diff --git a/doc/C/index.docbook b/doc/C/index.docbook
index 0fbcb6b..4183272 100644
--- a/doc/C/index.docbook
+++ b/doc/C/index.docbook
@@ -1835,10 +1835,7 @@ Optional packages: (JHBuild will build the missing packages)
           </term>
           <listitem>
             <simpara>A string specifying a program to use as replacement for
-              <literal>/usr/bin/install</literal>. If available, defaults to the
-              <literal>install-check</literal> wrapper provided by JHBuild. The
-              <literal>install-check</literal> wrapper optimizes header
-              installation to reduce the time taken for rebuilds.</simpara>
+              <literal>/usr/bin/install</literal>.</simpara>
           </listitem>
         </varlistentry>
         <varlistentry id="cfg-ignore-suggests">
diff --git a/jhbuild/defaults.jhbuildrc b/jhbuild/defaults.jhbuildrc
index 4af0f12..3f54b68 100644
--- a/jhbuild/defaults.jhbuildrc
+++ b/jhbuild/defaults.jhbuildrc
@@ -80,13 +80,8 @@ cmakeargs = ''
 makeargs = ''
 cflags = ''
 
-# a alternative install program to use; the included install-check
-# program won't update timestamps if the header hasn't changed
-installprog = os.path.join(os.environ['HOME'], '.local/bin', 'install-check')
-if not os.path.exists(installprog):
-    installprog = '/usr/bin/install-check'
-if not os.path.exists(installprog):
-    installprog = None
+# a alternative install program to use
+installprog = None
 
 # override cvs roots, branch tags, etc
 repos = {}