Convert the tla-generated versioning info to git-generated

	This changeset converts all of our sexy automagic versioning info
	from being tla-based to being git-based.  The old tla variables
	are now gone, replaced with git equivalents...

	    SXEMACS_ARCH_VERSION -> SXEMACS_GIT_VERSION
	    sxemacs_arch_version -> sxemacs_git_version
	    sxemacs-arch-version -> sxemacs-git-version
	    SXEMACS_MAIN_ARCH_VERSION -> removed.

	Also, a .gitignore has been added to the repo.

	* src/emacs.c (vars_of_emacs): New variable, Vsxemacs_git_version,
	sxemacs-git-version

	* m4/sxe-summary.m4: tla -> git

	* lisp/version.el (emacs-version): Use sxemacs-git-version instead
	of the old arch one.

	* lisp/obsolete.el (sxemacs-arch-version): Obsolete it.

	* lisp/build-rpt.el (build-rpt-subject): Use SXEMACS_GIT_VERSION
	instead of the old arch one.

	* configure.ac: tla -> git

	* autogen.sh: Convert all the tla/arch stuff to git stuff.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/.arch-inventory b/.arch-inventory
deleted file mode 100644 (file)
index d6ab58d..0000000
--- a/.arch-inventory
+++ /dev/null
@@ -1,27 +0,0 @@
-precious ^(configure)$
-precious ^(config\.status)$
-precious ^(config\.log)$
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(Installation)$
-precious ^(autom4te\.cache)$
-precious ^(html)$
-precious ^(aclocal\.m4)$
-precious ^(compile)$
-precious ^(config(fsf)?\.(guess|sub))$
-precious ^(depcomp)$
-precious ^(install-sh)$
-precious ^(missing)$
-precious ^(sxemacs_version\.m4)$
-precious ^(texinfo\.tex)$
-precious ^(\.sxemacs\.source\.tree)$
-precious ^(\.deps)$
-precious ^(ylwrap)$
-precious ^(emod_static_syms.c)$
-precious ^(emod_static_vars.c)$
-precious ^(ltmain.sh)$
-precious ^(libtool)$
-precious ^sxemacs\.pc$
-precious ^cpuid$
-precious ^libltdl$
-precious ^lock$

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..c7cb161
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,63 @@
+####
+# This file is used to ignore certain files in the repo, such as
+# anything that is generated by the build, etc.
+#
+# The SXEmacs project uses a single .gitignore, so please DO NOT add
+# any .gitignore files to any of the sub directories.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard' command after
+# changing this file, to see if there are any tracked files which get
+# ignored after the change.
+####
+
+## Standard stuff
+*~
+*.orig
+\#*#
+*.o
+*.a
+*.s
+*.i
+
+## autotools
+aclocal.m4
+autom4te.cache
+compile
+configure
+config.guess
+configfsf.guess
+config.sub
+configfsf.sub
+depcomp
+install-sh
+libltdl
+ltmain.sh
+m4/argz.m4
+m4/libtool.m4
+m4/ltdl.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
+Makefile.in
+src/config.h.in
+sxemacs_version.m4
+texinfo.tex
+ylwrap
+
+## Docs
+*.html
+*.info
+*.info-*
+
+## Elisp
+*.elc
+auto-autoloads.el
+custom-load.el
+custom-defines.el
+
+## Because I'm so used to arch (tla)
+,,*
+++*
+=build

diff --git a/autogen.sh b/autogen.sh
index bc39a4c..01bf4cd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,40 +17,25 @@ if test -d "/usr/xpg4/bin"; then
     export PATH
 fi
 
-type tla >/dev/null 2>&1 && TLA=tla
+type git >/dev/null 2>&1 && GIT=git
 olddir=$(pwd)
 srcdir=$(dirname $0)
 cd "$srcdir"
 
 emacs_is_beta=t
-if test -n "$TLA" -a -n "$($TLA tree-version | grep '/sxemacs')"; then
-       TREE_VERSION="$($TLA tree-version)"
-       ARCH_VERSION="$($TLA logs -f|tail -n1)"
-       MAIN_VERSION="$($TLA log-versions|grep -- '--main--'|tail -n1)"
-       MAIN_ARCH_VERSION="$(tla logs -f $MAIN_VERSION|tail -n1)"
-elif test -d "{arch}" -a -s "{arch}/++default-version"; then
-       TREE_VERSION=$(cat "{arch}/++default-version")
-       ARCH_VERSION="$TREE_VERSION--version-X"
-       CURDIR=$(pwd)
-       cd "{arch}/sxemacs/sxemacs--main"
-       MAIN_VERSION="$(/bin/ls|tail -n1)"
-       cd "$MAIN_VERSION"
-       MAIN_VERSION="$(/bin/ls)/$MAIN_VERSION"
-       cd "$(/bin/ls)/patch-log"
-       MAIN_ARCH_VERSION="$MAIN_VERSION--$(/bin/ls|grep -v base|sort -k1.7|tail -n1)"
-       cd "$CURDIR"
+if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then
+       TREE_VERSION="$($GIT tag|tail -n1|tr -d v)"
+       GIT_VERSION="$($GIT describe)"
 else
-       TREE_VERSION="--22.1.12"
-       ARCH_VERSION="no_arch_version"
-       MAIN_ARCH_VERSION="no_arch_version"
+       TREE_VERSION="22.1.13"
+       GIT_VERSION="no_git_version"
 fi
 
-emacs_major_version="$(echo $TREE_VERSION|sed -e s/"^.*--"//|cut -d . -f1)"
-emacs_minor_version="$(echo $TREE_VERSION|sed -e s/"^.*--"//|cut -d . -f2)"
-emacs_beta_version="$(echo $TREE_VERSION|sed -e s/"^.*--"//|cut -d . -f3)"
-sxemacs_codename="Fiat"
-sxemacs_arch_version="$ARCH_VERSION"
-sxemacs_main_arch_version="$MAIN_ARCH_VERSION"
+emacs_major_version="$(echo $TREE_VERSION|cut -d. -f1)"
+emacs_minor_version="$(echo $TREE_VERSION|cut -d. -f2)"
+emacs_beta_version="$(echo $TREE_VERSION|cut -d. -f3)"
+sxemacs_codename="Ford"
+sxemacs_git_version="$GIT_VERSION"
 
 autoconf_ver=$(autoconf --version 2>/dev/null | head -n1)
 autoheader_ver=$(autoheader --version 2>/dev/null | head -n1)
@@ -60,31 +45,21 @@ libtool_ver=$(libtool --version 2>/dev/null | head -n1)
 
 
 # When things go wrong... get a bigger hammer!
-_regexp='++log\|=b\(ui\)*ld'
-
 if test -n "$PHAMMER"; then
     HAMMER=$PHAMMER
 fi
 
-if test -n "$HAMMER" -o -n "$REGEXP"; then
-    if test -n "$TLA" -a -n "$($TLA tree-version | grep '/sxemacs')"; then
-       if test -n "$REGEXP" -a "$HAMMER" != "BHFH"; then
-           $TLA inventory -pbB|grep -v "$_regexp\|$REGEXP"|xargs rm -vrf
-           unset REGEXP
+if test -n "$HAMMER"; then
+       if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then
+               $GIT clean -fxd
        else
-           if test "$HAMMER" = "BHFH"; then
-               $TLA inventory -pjubB|xargs rm -vrf
-           else
-               $TLA inventory -pbB|grep -v "$_regexp"|xargs rm -vrf
-           fi
+               echo "ERROR: Not a git workspace, or you don't have git" >&2
+               exit 1
        fi
-    else
-       echo "ERROR: Could not HAMMER=$HAMMER because we are not inside a tla controled workspace"
-       exit 1
-    fi
-    unset HAMMER
+       unset HAMMER
 fi
 
+
 cat>sxemacs_version.m4<<EOF
 dnl autogenerated version number
 m4_define([SXEM4CS_VERSION], [$emacs_major_version.$emacs_minor_version.$emacs_beta_version])
@@ -92,8 +67,7 @@ m4_define([SXEM4CS_MAJOR_VERSION], [$emacs_major_version])
 m4_define([SXEM4CS_MINOR_VERSION], [$emacs_minor_version])
 m4_define([SXEM4CS_BETA_VERSION], [$emacs_beta_version])
 m4_define([SXEM4CS_BETA_P], [$emacs_is_beta])
-m4_define([SXEM4CS_ARCH_VERSION], [$sxemacs_arch_version])
-m4_define([SXEM4CS_MAIN_ARCH_VERSION], [$sxemacs_main_arch_version])
+m4_define([SXEM4CS_GIT_VERSION], [$sxemacs_git_version])
 m4_define([SXEM4CS_CODENAME], [$sxemacs_codename])
 m4_define([4UTOCONF_VERSION], [$autoconf_ver])
 m4_define([4UTOHEADER_VERSION], [$autoheader_ver])

diff --git a/configure.ac b/configure.ac
index 9b2fd54..b62310e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_COPYRIGHT(
 ###    config.status is removed.
 ])
 
-AC_REVISION([SXEM4CS_ARCH_VERSION])
+AC_REVISION([SXEM4CS_GIT_VERSION])
 
 
 dnl Build Options
@@ -819,7 +819,7 @@ SXE_EXPLORE_BUILD_ENVIRONMENT
 dnl ----------------------------------------
 dnl Find out which version of SXEmacs this is
 dnl ----------------------------------------
-AC_CHECK_PROG([have_tla], [tla], [yes], [no])
+AC_CHECK_PROG([have_git], [git], [yes], [no])
 AC_MSG_CHECKING([for SXEmacs version])
 AC_MSG_RESULT([SXEmacs SXEM4CS_VERSION])
 dnl Must do the following first to determine verbosity for AC_DEFINE
@@ -833,25 +833,16 @@ fi
 AC_MSG_CHECKING([for SXEmacs patchlevel])
 CURDIR=$(pwd)
 cd "$sxe_srcdir"
-if test "$have_tla" = "yes"; then
-       sxemacs_arch_version="$(tla logs -f 2>/dev/null|tail -n1)"
+if test "$have_git" = "yes"; then
+       sxemacs_git_version="$(git describe)"
 fi
-if test -z "$sxemacs_arch_version" ; then
-       sxemacs_arch_version="[]SXEM4CS_ARCH_VERSION[]"
-fi
-AC_MSG_RESULT([$sxemacs_arch_version])
-version="$sxemacs_arch_version"
-AC_MSG_CHECKING([for last main branch SXEmacs patchlevel sync])
-if test "$have_tla" = "yes"; then
-       sxemacs_main_version="$(tla log-versions 2>/dev/null|grep -- '--main--' 2>/dev/null|tail -n1)"
-       sxemacs_main_arch_version="$(tla logs -f $sxemacs_main_version 2>/dev/null|tail -n1)"
-fi
-if test -z "$sxemacs_main_arch_version" ; then
-       sxemacs_main_arch_version="[]SXEM4CS_MAIN_ARCH_VERSION[]"
+if test -z "$sxemacs_git_version" ; then
+       sxemacs_git_version="[]SXEM4CS_GIT_VERSION[]"
 fi
+AC_MSG_RESULT([$sxemacs_git_version])
+version="$sxemacs_git_version"
 cd "$CURDIR"
-AC_MSG_RESULT([$sxemacs_main_arch_version])
-main_version="$sxemacs_arch_version"
+main_version="$sxemacs_git_version"
 AC_DEFINE_UNQUOTED([EMACS_MAJOR_VERSION], [SXEM4CS_MAJOR_VERSION], [Description here!])
 AC_DEFINE_UNQUOTED([EMACS_MINOR_VERSION], [SXEM4CS_MINOR_VERSION], [Description here!])
 old_version=[]SXEM4CS_VERSION[]
@@ -869,8 +860,7 @@ if test -n "[]SXEM4CS_BETA_VERSION[]"; then
 fi
 AC_DEFINE_UNQUOTED([SXEMACS_CODENAME], ["[]SXEM4CS_CODENAME[]"], [Description here!])
 AC_DEFINE_UNQUOTED([EMACS_VERSION], ["$version"], [Description here!])
-AC_DEFINE_UNQUOTED([SXEMACS_MAIN_ARCH_VERSION], ["$sxemacs_main_arch_version"], [Description here!])
-AC_DEFINE_UNQUOTED([SXEMACS_ARCH_VERSION], ["$sxemacs_arch_version"],
+AC_DEFINE_UNQUOTED([SXEMACS_GIT_VERSION], ["$sxemacs_git_version"],
        [Description here!])
 
 PROGNAME=sxemacs

diff --git a/etc/.arch-inventory b/etc/.arch-inventory
deleted file mode 100644 (file)
index 0f59644..0000000
--- a/etc/.arch-inventory
+++ /dev/null
@@ -1,3 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(sxemacs.desktop)$

diff --git a/info/.arch-inventory b/info/.arch-inventory
deleted file mode 100644 (file)
index 364fe02..0000000
--- a/info/.arch-inventory
+++ /dev/null
@@ -1,6 +0,0 @@
-precious \.info[-0-9]*$
-precious ^(.*\.dvi)$
-precious ^(.*\.ps)$
-precious ^(.*\.pdf)$
-precious ^(Makefile\.in)$
-precious ^(Makefile)$

diff --git a/info/internals/.arch-inventory b/info/internals/.arch-inventory
deleted file mode 100644 (file)
index bcb3d95..0000000
--- a/info/internals/.arch-inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-precious ^(Makefile\.in)$
-precious \.info[-0-9]*$

diff --git a/info/lispref/.arch-inventory b/info/lispref/.arch-inventory
deleted file mode 100644 (file)
index bcb3d95..0000000
--- a/info/lispref/.arch-inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-precious ^(Makefile\.in)$
-precious \.info[-0-9]*$

diff --git a/info/new-users-guide/.arch-inventory b/info/new-users-guide/.arch-inventory
deleted file mode 100644 (file)
index bcb3d95..0000000
--- a/info/new-users-guide/.arch-inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-precious ^(Makefile\.in)$
-precious \.info[-0-9]*$

diff --git a/info/sxemacs/.arch-inventory b/info/sxemacs/.arch-inventory
deleted file mode 100644 (file)
index bcb3d95..0000000
--- a/info/sxemacs/.arch-inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-precious ^(Makefile\.in)$
-precious \.info[-0-9]*$

diff --git a/lib-src/.arch-inventory b/lib-src/.arch-inventory
deleted file mode 100644 (file)
index 3a58d12..0000000
--- a/lib-src/.arch-inventory
+++ /dev/null
@@ -1,29 +0,0 @@
-precious ^(config\.values)$
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(yow)$
-precious ^(wakeup)$
-precious ^(sorted-doc)$
-precious ^(.*\.o)$
-precious ^(profile)$
-precious ^(ootags)$
-precious ^(movemail)$
-precious ^(mmencode)$
-precious ^(make-path)$
-precious ^(make-dump-id)$
-precious ^(make-docfile)$
-precious ^(hexl)$
-precious ^(gnuserv)$
-precious ^(gnuclient)$
-precious ^(fakemail)$
-precious ^(etags)$
-precious ^(ellcc)$
-precious ^(digest-doc)$
-precious ^(cvtmail)$
-precious ^(ctags2?)$
-precious ^(b2m)$
-precious ^(DOC)$
-precious ^(ellcc\.h)$
-precious ^(\.deps)$
-precious ^(\.libs)$

diff --git a/lisp/.arch-inventory b/lisp/.arch-inventory
deleted file mode 100644 (file)
index f886df5..0000000
--- a/lisp/.arch-inventory
+++ /dev/null
@@ -1,13 +0,0 @@
-precious ^(finder-inf\.el)$
-precious ^(custom-(load|defines)\.el)$
-precious ^(auto-autoloads\.el)$
-precious ^(.*\.elc)$
-precious ^(.*\.elc.stamp)$
-precious ^(Makefile\.in)$
-precious ^(update-elc\.stamp)$
-precious ^(Makefile)$
-precious ^(autoc?\.stamp)$
-precious ^(bldchn\.stamp)$
-precious ^(ffi\.stamp)$
-precious ^(mule\.stamp)$
-precious ^(term\.stamp)$
\ No newline at end of file

diff --git a/lisp/build-rpt.el b/lisp/build-rpt.el
index 56cc606..e9c2ba2 100644 (file)
--- a/lisp/build-rpt.el
+++ b/lisp/build-rpt.el
@@ -177,7 +177,7 @@ redirection, like so...
 
 (defcustom build-rpt-subject
   (concat "[%s] "
-         (gethash 'SXEMACS_ARCH_VERSION (config-value-hash-table))
+         (gethash 'SXEMACS_GIT_VERSION (config-value-hash-table))
          " on " system-configuration)
   "*SXEmacs Build Report Subject Line. %s-sequences will be substituted
   with user input through `build-rpt' according to

diff --git a/lisp/ffi/.arch-inventory b/lisp/ffi/.arch-inventory
deleted file mode 100644 (file)
index 60ee54c..0000000
--- a/lisp/ffi/.arch-inventory
+++ /dev/null
@@ -1,5 +0,0 @@
-precious ^(custom-(load|defines)\.el)$
-precious ^(auto-autoloads\.el)$
-precious ^(.*\.elc)$
-precious ^(Makefile)$
-precious ^(Makefile.in)$

diff --git a/lisp/mule/.arch-inventory b/lisp/mule/.arch-inventory
deleted file mode 100644 (file)
index 60ee54c..0000000
--- a/lisp/mule/.arch-inventory
+++ /dev/null
@@ -1,5 +0,0 @@
-precious ^(custom-(load|defines)\.el)$
-precious ^(auto-autoloads\.el)$
-precious ^(.*\.elc)$
-precious ^(Makefile)$
-precious ^(Makefile.in)$

diff --git a/lisp/obsolete.el b/lisp/obsolete.el
index 7b8a154..4ba7ac1 100644 (file)
--- a/lisp/obsolete.el
+++ b/lisp/obsolete.el
@@ -419,5 +419,8 @@ the resulting string may be narrower than END-COLUMN."
 
 (make-obsolete 'function-called-at-point 'function-at-point)
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;; Arch Version stuff
+(make-obsolete-variable 'sxemacs-arch-version 'sxemacs-git-version "22.1.13")
+
 (provide 'obsolete)
 ;;; obsolete.el ends here

diff --git a/lisp/term/.arch-inventory b/lisp/term/.arch-inventory
deleted file mode 100644 (file)
index b718b7d..0000000
--- a/lisp/term/.arch-inventory
+++ /dev/null
@@ -1 +0,0 @@
-precious ^(.*\.elc)$

diff --git a/lisp/version.el b/lisp/version.el
index c540773..8f999b1 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -34,7 +34,7 @@
   "Non-nil when this is a test (beta) version of XEmacs.
 Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
-(defconst emacs-version sxemacs-arch-version
+(defconst emacs-version (concat "SXEmacs: " sxemacs-git-version)
   "Version numbers of this version of XEmacs.")
 
 ;; Sadly, our `emacs-version' causes a problem for Dired.  This is because
@@ -80,9 +80,9 @@ to the system configuration; look at `system-configuration' instead."
   (interactive "p")
   (save-match-data
     (let ((version-string
-          (format
+          (format 
            "SXEmacs: %s, built %s on %s"
-           sxemacs-arch-version
+           sxemacs-git-version
            emacs-build-time
            emacs-build-system)))
       (cond

diff --git a/m4/.arch-inventory b/m4/.arch-inventory
deleted file mode 100644 (file)
index a7094b5..0000000
--- a/m4/.arch-inventory
+++ /dev/null
@@ -1,3 +0,0 @@
-precious ^argz\.m4$
-precious ^libtool\.m4$
-precious ^lt.*\.m4$

diff --git a/m4/sxe-summary.m4 b/m4/sxe-summary.m4
index 20e39a2..4be5f78 100644 (file)
--- a/m4/sxe-summary.m4
+++ b/m4/sxe-summary.m4
@@ -14,13 +14,8 @@ AC_DEFUN([SXE_SUMMARY], [dnl
 (
 echo "
 
-SXEmacs $sxemacs_arch_version \"[]CODENAME[]\" configured for \`$ac_cv_build'.
+SXEmacs $sxemacs_git_version \"[]CODENAME[]\" configured for \`$ac_cv_build'.
 "
-if test "$sxemacs_arch_version" != "$sxemacs_main_arch_version"
-then
-echo "(Last sync with sxemacs main: $sxemacs_main_arch_version)
-"
-fi
 echo "
 Compilation Environment and Installation Defaults:"
 echo "  Source code location:              $sxe_srcdir"

diff --git a/modules/.arch-inventory b/modules/.arch-inventory
deleted file mode 100644 (file)
index 12648fa..0000000
--- a/modules/.arch-inventory
+++ /dev/null
@@ -1,4 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(auto-autoloads\.elc?)$
-precious ^(custom-(load|defines)\.elc?)$

diff --git a/modules/ase/.arch-inventory b/modules/ase/.arch-inventory
deleted file mode 100644 (file)
index bfe9177..0000000
--- a/modules/ase/.arch-inventory
+++ /dev/null
@@ -1,19 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(ase.*\.ell)$
-precious ^(ase.*\.la)$
-precious ^(ase.*\.lo)$
-precious ^(ase.*_i\.c)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(ase\.doc\.c)$
-precious ^(ase-set\.doc\.c)$
-precious ^(ase-resclass\.doc\.c)$
-precious ^(ase-permutation\.doc\.c)$
-precious ^(ase-neighbourhood\.doc\.c)$
-precious ^(ase-metric\.doc\.c)$
-precious ^(ase-interval\.doc\.c)$
-precious ^(ase-heap\.doc\.c)$
-precious ^(ase-digraph\.doc\.c)$
-precious ^(ase-cartesian\.doc\.c)$
-precious ^(.*[-\.]?.*\.o)$

diff --git a/modules/cl/.arch-inventory b/modules/cl/.arch-inventory
deleted file mode 100644 (file)
index e78bb93..0000000
--- a/modules/cl/.arch-inventory
+++ /dev/null
@@ -1,13 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(cl.*\.ell)$
-precious ^(cl.*\.la)$
-precious ^(cl.*\.lo)$
-precious ^(cl.*_i\.c)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(.*[-\.]?.*\.o)$
-precious ^(cl-loop-parser.c)$
-precious ^(cl\.doc\.c)$
-precious ^(cl-loop\.doc\.c)$
-precious ^(cl-loop-parser.h)$

diff --git a/modules/ldap/.arch-inventory b/modules/ldap/.arch-inventory
deleted file mode 100644 (file)
index 1192406..0000000
--- a/modules/ldap/.arch-inventory
+++ /dev/null
@@ -1,6 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(eldap\.ell)$
-precious ^(eldap_i\.c)$
-precious ^(\.deps)$
-precious ^(.*-.*\.o)$

diff --git a/src/.arch-inventory b/src/.arch-inventory
deleted file mode 100644 (file)
index 6d3b1fa..0000000
--- a/src/.arch-inventory
+++ /dev/null
@@ -1,40 +0,0 @@
-precious ^(config\.h)$
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(paths\.h)$
-precious ^(update-elc\.stamp)$
-precious ^(sheap-adjust\.h)$
-precious ^(dump-id\.c)$
-precious ^(NEEDTODUMP)$
-precious ^(Emacs\.ad\.h)$
-precious ^(libextcli_Xt\.so\.1)$
-precious ^(libextcli_Xt\.l?a)$
-precious ^(libextcli_Xlib\.so\.1)$
-precious ^(libextcli_Xlib\.l?a)$
-precious ^(core.*)$
-precious ^(sxemacs\.dmp)$
-precious ^(sxemacs)$
-precious ^(temacs)$
-precious ^(depend)$
-precious ^(\.dbxrc)$
-precious ^(.*\.o)$
-precious ^(sxe-paths\.h)$
-precious ^(config\.values)$
-precious ^(libTopLevelEmacsShell\.l?a)$
-precious ^(libTransientEmacsShell\.l?a)$
-precious ^(libcruft\.l?a)$
-precious ^(libdb\.l?a)$
-precious ^(libent\.l?a)$
-precious ^(libmemalloc\.l?a)$
-precious ^(libmule\.l?a)$
-precious ^(libsxeX\.l?a)$
-precious ^(libsxecore\.l?a)$
-precious ^(libsxeui\.l?a)$
-precious ^(libsxeevents\.l?a)$
-precious ^(libsxemem\.l?a)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(DOC)$
-precious ^(config\.h\.in)$
-precious ^(stamp-h1)$

diff --git a/src/database/.arch-inventory b/src/database/.arch-inventory
deleted file mode 100644 (file)
index 17b6dce..0000000
--- a/src/database/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libsxedb\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/emacs.c b/src/emacs.c
index 7018430..ba27e28 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -281,8 +281,7 @@ Lisp_Object Vemacs_major_version;
 Lisp_Object Vemacs_minor_version;
 Lisp_Object Vemacs_patch_level;
 Lisp_Object Vemacs_beta_version;
-Lisp_Object Vsxemacs_arch_version;
-Lisp_Object Vsxemacs_main_arch_version;
+Lisp_Object Vsxemacs_git_version;
 Lisp_Object Vsxemacs_codename;
 #ifdef INFODOCK
 Lisp_Object Vinfodock_major_version;
@@ -3447,20 +3446,12 @@ earlier than 20.3.
        Vemacs_beta_version = Qnil;
 #endif
 
-       DEFVAR_LISP("sxemacs-arch-version", &Vsxemacs_arch_version /*
-This is the fully qualified GNU/arch revision name of this SXEmacs.
+       DEFVAR_LISP("sxemacs-git-version", &Vsxemacs_git_version /*
+This revision name of this SXEmacs.
 Warning: this variable does not exist in FSF Emacs or XEmacs.
                                                                   */ );
 
-       Vsxemacs_arch_version = build_string(SXEMACS_ARCH_VERSION);
-
-       DEFVAR_LISP("sxemacs-main-arch-version", &Vsxemacs_main_arch_version /*
-This is the fully qualified GNU/arch revision name of the main branch closest
-to this SXEmacs.
-Warning: this variable does not exist in FSF Emacs or XEmacs.
-                                                                  */ );
-
-       Vsxemacs_main_arch_version = build_string(SXEMACS_MAIN_ARCH_VERSION);
+       Vsxemacs_git_version = build_string(SXEMACS_GIT_VERSION);
 
 #ifdef INFODOCK
        DEFVAR_LISP("infodock-major-version", &Vinfodock_major_version /*

diff --git a/src/ent/.arch-inventory b/src/ent/.arch-inventory
deleted file mode 100644 (file)
index d696721..0000000
--- a/src/ent/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libent\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/events/.arch-inventory b/src/events/.arch-inventory
deleted file mode 100644 (file)
index e302070..0000000
--- a/src/events/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libsxeevents\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/media/.arch-inventory b/src/media/.arch-inventory
deleted file mode 100644 (file)
index fe897c8..0000000
--- a/src/media/.arch-inventory
+++ /dev/null
@@ -1,9 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(DOC)$
-precious ^(libmm\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/mem/.arch-inventory b/src/mem/.arch-inventory
deleted file mode 100644 (file)
index c66aab3..0000000
--- a/src/mem/.arch-inventory
+++ /dev/null
@@ -1,9 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libmemalloc\.l?a)$
-precious ^(libsxemem\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/mule/.arch-inventory b/src/mule/.arch-inventory
deleted file mode 100644 (file)
index 587ffd6..0000000
--- a/src/mule/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libmule\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/ui/.arch-inventory b/src/ui/.arch-inventory
deleted file mode 100644 (file)
index 6463d37..0000000
--- a/src/ui/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libsxeui\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/ui/Gtk/.arch-inventory b/src/ui/Gtk/.arch-inventory
deleted file mode 100644 (file)
index bee6ffc..0000000
--- a/src/ui/Gtk/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libsxeuiGtk\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/ui/TTY/.arch-inventory b/src/ui/TTY/.arch-inventory
deleted file mode 100644 (file)
index 274decc..0000000
--- a/src/ui/TTY/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libsxeuiTTY\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/ui/X11/.arch-inventory b/src/ui/X11/.arch-inventory
deleted file mode 100644 (file)
index 4bd6f85..0000000
--- a/src/ui/X11/.arch-inventory
+++ /dev/null
@@ -1,8 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(depend)$
-precious ^(\.deps)$
-precious ^(\.libs)$
-precious ^(libsxeuiX11\.l?a)$
-precious ^(.*\.o)$

diff --git a/src/ui/lwlib/.arch-inventory b/src/ui/lwlib/.arch-inventory
deleted file mode 100644 (file)
index 765d682..0000000
--- a/src/ui/lwlib/.arch-inventory
+++ /dev/null
@@ -1,10 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$
-precious ^(GNUmakefile)$
-precious ^(config\.h)$
-precious ^(stage[12])$
-precious ^(stamp-h2)$
-precious ^(\.deps)$
-precious ^(.*\.l?a)$
-precious ^(.*\.l?o)$
-precious ^(\.libs)$

diff --git a/tests/.arch-inventory b/tests/.arch-inventory
deleted file mode 100644 (file)
index c36e44c..0000000
--- a/tests/.arch-inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-precious ^(Makefile\.in)$
-precious ^(Makefile)$