misc: we use git now, not mercurial

This impacts:
  - .version            (kcf version)
  - configure.ac        (kcf version)
  - scripts/version.sh  (get the cset)
  - .gitignore          (instead of .hgignore)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..a74794a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,43 @@
+.*.swp
+*.o
+*.lo
+*.a
+*.la
+*.lai
+*.exe
+
+.libs/
+
+/frontends/conf/conf
+/frontends/conf/*-conf
+/frontends/gconf/gconf
+/frontends/gconf/*-gconf
+/frontends/mconf/mconf
+/frontends/mconf/*-mconf
+/frontends/nconf/nconf
+/frontends/nconf/*-nconf
+/frontends/qconf/qconf
+/frontends/qconf/*-qconf
+/frontends/qconf/qconf.moc
+
+/libs/images/images.c
+/libs/images/images.h
+/libs/parser/?conf.c
+
+/utils/tweak
+/utils/gettext
+/utils/*-gettext
+
+aclocal.m4
+configure
+config.log
+config.status
+libtool
+
+Makefile
+Makefile.in
+stamp-h1
+
+.deps/
+/autom4te.cache/
+/scripts/.autostuff

diff --git a/.hgignore b/.hgignore
deleted file mode 100644 (file)
index b0c027f..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,46 +0,0 @@
-syntax: glob
-
-.*.swp
-*.o
-*.lo
-*.a
-*.la
-*.lai
-*.exe
-
-frontends/conf/conf
-frontends/conf/*-conf
-frontends/gconf/gconf
-frontends/gconf/*-gconf
-frontends/mconf/mconf
-frontends/mconf/*-mconf
-frontends/nconf/nconf
-frontends/nconf/*-nconf
-frontends/qconf/qconf
-frontends/qconf/*-qconf
-frontends/qconf/qconf.moc
-frontends/*/.libs
-
-libs/images/images.c
-libs/images/images.h
-libs/parser/?conf.c
-libs/*/.libs
-
-utils/tweak
-utils/gettext
-utils/*-gettext
-utils/.libs
-
-aclocal.m4
-configure
-config.log
-config.status
-libtool
-
-Makefile
-Makefile.in
-stamp-h1
-
-.deps/
-autom4te.cache/
-scripts/.autostuff

diff --git a/.version b/.version
index adadaa0568d942ef0a30defb7c66ae67c195d7ad..343485ff7c2aeec74c2e5fe3b0de6e18ce4fa920 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
 3.9.0-rc4 8bb9660418e05bb1845ac1a2428444d78e322cc7 Unicycling Gorilla
-hg
+git

diff --git a/configure.ac b/configure.ac
index e90fd177a2a6af66656ee2f52e263727cbf8d36b..ad0cf5fb78e7626f71b8d30aef1accb61d1586ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AS_IF(
 AM_INIT_AUTOMAKE([foreign])
 
 AS_IF(
-    [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "git"],
     [AM_SILENT_RULES],
     [AM_SILENT_RULES([yes])])
 
@@ -68,7 +68,7 @@ AC_SUBST([wall_CFLAGS],[${wall_CFLAGS}])
 # For the devel tree, do build with -Werror by default, unless user
 # explicitly disables -Werror
 AS_IF(
-    [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "git"],
     [werror_CFLAGS=-Werror])
 AC_ARG_ENABLE(
     [werror],

diff --git a/scripts/version.sh b/scripts/version.sh
index b3d0c6ebeab3daccc4d3233a721993732cb167be..80d104103caf27def442801311a788bccdec3174 100755 (executable)
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -29,10 +29,10 @@ k_ver_plain="$( printf "%s" "${k_ver}"  \
                 |sed -r -e 's/-rc.*//;' )"
 
 case "${kf_ver}" in
-    hg) kf_ver="hg_$( hg id -i -r . )"
-        k_ver_extra="$( printf "_%-7.7s" "${k_cset}" )"
-        ;;
-    *)  k_ver_extra="";;
+    git) kf_ver="-$( git rev-parse --short HEAD )"
+         k_ver_extra="$( printf "_%-7.7s" "${k_cset}" )"
+         ;;
+    *)   k_ver_extra="";;
 esac
 
 if [ "${plain}" -eq 1 ]; then