Skip to content

Commit

Permalink
build: CVS no more
Browse files Browse the repository at this point in the history
  • Loading branch information
ygrek committed Jun 21, 2020
1 parent f058681 commit 818681e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 61 deletions.
5 changes: 1 addition & 4 deletions config/Makefile.in
Expand Up @@ -1711,8 +1711,7 @@ endif
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.sources:
rm -rf **/CVS
release.sources:
rm -f config/Makefile.config
cd ..; tar zcf mldonkey-$(CURRENT_VERSION).sources.tar.gz mldonkey

Expand All @@ -1721,7 +1720,6 @@ distrib: $(DISDIR)
$(DISDIR): static distrib/Readme.txt
rm -rf mldonkey-*
cp -R distrib $(DISDIR)
rm -rf $(DISDIR)/CVS
for i in $(RELEASE_TARGETS); do \
cp $$i.static $(DISDIR)/$$i && strip $(DISDIR)/$$i; \
done
Expand All @@ -1736,7 +1734,6 @@ shared: $(SHADIR)
$(SHADIR): static distrib/Readme.txt
rm -rf mldonkey-*
cp -R distrib $(SHADIR)
rm -rf $(SHADIR)/CVS
for i in $(RELEASE_TARGETS); do \
cp $$i.static $(SHADIR)/$$i && strip $(SHADIR)/$$i; \
done
Expand Down
58 changes: 1 addition & 57 deletions config/configure.in
Expand Up @@ -216,9 +216,7 @@ esac

ARCH=$arch

# ********** **********
# ********** Parse checkout date (CVS) or revision (SVN) if available **********
# ********** **********
# Parse git version if available

if test -d ../.git; then
AC_MSG_NOTICE(checking git revision)
Expand All @@ -241,60 +239,6 @@ if test -d ../.git; then
fi
fi

if test -d .svn; then
AC_MSG_NOTICE(checking SVN revision)
AC_CHECK_PROG(SVNVERSION,svnversion,svnversion)
if test "$ac_cv_prog_SVNVERSION" = "svnversion"; then
SUB_VERSION3="SVN"
SCM_VERSION=`svnversion -n .`
else
AC_MSG_NOTICE(cannot checking SVN revision... no SVNVERSION)
SCM_VERSION="cannot find out SVN revision (no SVNVERSION)"
fi
fi

if test -f ./CVS/Entries ; then
AC_MSG_NOTICE(checking CVS checkout date)
AC_CHECK_PROGS(STAT, stat gstat, stat)
if [ test "$ac_cv_prog_STAT" = "stat" ] || [ test "$ac_cv_prog_STAT" = "gstat" ]; then
AC_CHECK_PROG(SED, sed, sed)
if test "$ac_cv_prog_SED" = "sed"; then
AC_CHECK_PROG(CUT, cut, cut)
if test "$ac_cv_prog_CUT" = "cut"; then
SUB_VERSION3="CVS"
if [ test "$SYSTEM" = "freebsd"] || [ test "$SYSTEM" = "netbsd"] || ( [ test "$SYSTEM" = "macos" ] && [ test "$ac_cv_prog_STAT" != "gstat" ] ); then
SCM_VERSION=`$STAT -f "%Sm" ./CVS/Entries | $SED -e 's/\(.*\) \(.*\) \(.*\) \(.*\)/\4-\1-\2 \3/'`
else
if [ test "$SYSTEM" = "openbsd"]; then
AC_CHECK_PROG(GREP, grep, grep)
if test "$ac_cv_prog_GREP" = "grep"; then
SCM_VERSION=`$STAT -f %a ./CVS/Entries | $GREP -v Entries | $SED -e 's/\(.*\) \(.*\) \(.*\) \(.*\)/\1-\2-\4 \3/'`
fi
else
if [ test "$SYSTEM" = "mingw"] || [ test "$SYSTEM" = "cygwin"]; then
AC_CHECK_PROG(GREP, grep, grep)
if test "$ac_cv_prog_GREP" = "grep"; then
SCM_VERSION=`$STAT ./CVS/Entries | $GREP Modify | $SED -e 's/\(.*\) \(.*\) \(.*\) \(.*\) \(.*\)/\5-\2-\3 \4/'`
fi
else
SCM_VERSION=`$STAT -Lc %y ./CVS/Entries | $SED -e 's#\.[0-9]*##' | $CUT -c 1-19`
fi #if [ test "$SYSTEM" = "mingw"] || ...
fi #if [ test "$SYSTEM" = "openbsd"]
fi #if [ test "$SYSTEM" = "freebsd"] || ...
else
AC_MSG_NOTICE(cannot checking CVS checkout date... no CUT)
SCM_VERSION="cannot find out SCM Version (no CUT)"
fi
else
AC_MSG_NOTICE(cannot checking CVS checkout date... no SED)
SCM_VERSION="cannot find out SCM Version (no SED)"
fi
else
AC_MSG_NOTICE(cannot checking CVS checkout date... no STAT)
SCM_VERSION="cannot find out SCM Version (no STAT)"
fi
fi

# ********** **********
# ********** build MLDonkey version, Required OCaml and LablGTK versions **********
# ********** **********
Expand Down

0 comments on commit 818681e

Please sign in to comment.