emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] scratch/hyperbole-merge-7.0.2b a6eb9f8: Re-apply commit 1188e43f1


From: Stefan Monnier
Subject: [elpa] scratch/hyperbole-merge-7.0.2b a6eb9f8: Re-apply commit 1188e43f16, apparently lost
Date: Tue, 5 Feb 2019 16:44:27 -0500 (EST)

branch: scratch/hyperbole-merge-7.0.2b
commit a6eb9f837ee1a3702e7e266b4a9ad829b2e38755
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    Re-apply commit 1188e43f16, apparently lost
---
 Changes        |  3 +++
 MANIFEST       |  1 -
 Makefile       |  2 +-
 smart-clib-sym | 15 ++++-----------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Changes b/Changes
index 21e809c..8b13892 100644
--- a/Changes
+++ b/Changes
@@ -380,6 +380,9 @@ V7.0.1 changes ^^^^:
 
 * hversion.el: Updated to 7.0.0 for major release.
 
+* smart-clib-sym: Removed file-newer Perl script dependency.
+  file-newer: Removed.
+
 * Makefile (help): Removed misplaced double quote characters.
 
 * hui-window.el (hmouse-drag-window-side): Fixed coordinate error when drag 
release is outside of Emacs.
diff --git a/MANIFEST b/MANIFEST
index 18ed3aa..6e5cd62 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -75,7 +75,6 @@ kotl/EXAMPLE.kotl   - Sample Koutline document explaining 
Koutliner features
 hgnus.el            - GNU Hyperbole buttons in news reader/poster: GNUS
 
 --- HYPERBOLE INTERNALS ---
-file-newer          - Perl script which returns 1 if file 1 is newer than file 
2
 hactypes.el         - Default action types for GNU Hyperbole
 hbdata.el           - GNU Hyperbole button attribute accessor functions
 hibtypes.el         - GNU Hyperbole default implicit button types
diff --git a/Makefile b/Makefile
index 2969b0c..6fd8ad1 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ ELC_KOTL = kotl/kexport.elc kotl/kfile.elc kotl/kfill.elc 
kotl/kimport.elc kotl/
 
 HYPERBOLE_FILES = dir hyperbole-pkg.el info html $(EL_SRC) $(EL_COMPILE) 
$(EL_KOTL) \
        $(ELC_COMPILE) Changes COPYING Makefile HY-ABOUT HY-ANNOUNCE HY-NEWS \
-       HY-WHY.kotl INSTALL DEMO DEMO-ROLO.otl MANIFEST README _hypb .hypb 
file-newer smart-clib-sym \
+       HY-WHY.kotl INSTALL DEMO DEMO-ROLO.otl MANIFEST README _hypb .hypb 
smart-clib-sym \
        topwin.py hyperbole-banner.png $(man_dir)/hkey-help.txt \
        $(man_dir)/hyperbole.texi $(man_dir)/hyperbole.css 
$(man_dir)/version.texi
 
diff --git a/smart-clib-sym b/smart-clib-sym
index 3b46765..f1b6403 100755
--- a/smart-clib-sym
+++ b/smart-clib-sym
@@ -23,10 +23,6 @@
 #   Either 1 if symbol is found or 0 if not.
 
 # Code:
-#
-# Perl script used to tell whether one file is newer than another.
-#
-set fn = "file-newer"
 
 # Create this file and place in the file the full path for each C, C++ or
 # Objective-C library that you want scanned for symbol names.  One filename
@@ -40,16 +36,10 @@ set clib_list = "~/.CLIBS-LIST"
 #
 set clib_symbols = "~/.clibs-symbols"
 
-# Try to locate 'perl' and 'file-newer' script for use.
-
-which perl >& /dev/null
-if ($status) unset fn
-
 set st = 0 rebuild = 0
 if (-e $clib_list) then
    if (! -e $clib_symbols || -z $clib_symbols) set rebuild = 1
-   if (! $rebuild  && $?fn) @ rebuild = `perl $fn $clib_list $clib_symbols`
-   if ($rebuild) then
+   if ($rebuild || (-M $clib_list) > (-M $clib_symbols)) then
       nm -g `cat $clib_list` | grep '^[0-9 ].* _[A-Za-z]' | sed -e 
's/^[^_][^_]*_//g' | sort | uniq > $clib_symbols
    endif
    fgrep -sx $1 $clib_symbols >& /dev/null
@@ -58,3 +48,6 @@ endif
 
 echo $st
 exit $st
+
+
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]