Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fastNLO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
qcd-public
fastNLO
Commits
c89e5ae2
Commit
c89e5ae2
authored
7 years ago
by
Klaus Rabbertz
Browse files
Options
Downloads
Patches
Plain Diff
Adapt autotools setup to git
parent
03297fad
Branches
Branches containing commit
Tags
2450
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
v2.0/toolkit/Makefile.am
+6
-6
6 additions, 6 deletions
v2.0/toolkit/Makefile.am
v2.0/toolkit/configure.ac
+10
-6
10 additions, 6 deletions
v2.0/toolkit/configure.ac
with
16 additions
and
12 deletions
v2.0/toolkit/Makefile.am
+
6
−
6
View file @
c89e5ae2
...
...
@@ -15,13 +15,13 @@ SUBDIRS = data doc fastnlotoolkit src pyext check fortranext
# Provide local m4 macros in dir m4, copy also system-wide macros
ACLOCAL_AMFLAGS
=
-I
m4
--install
# Add subversion revision number
,
recipe from Autotools by J. Calcote
EXTRA_DIST
=
m4
SVN
REV
# Add
git equivalent of
subversion revision number
(original svn
recipe from Autotools by J. Calcote
).
EXTRA_DIST
=
m4
GIT
REV
# This gives e.g. fastnlo-2.0.0-643M for svn revision 643 locally modified
distdir
=
$(
PACKAGE
)
-
$(
VERSION
)
-
$(
SVN
REV
)
# Don't put .
svn
subdirs into distribution package
distdir
=
$(
PACKAGE
)
-
$(
VERSION
)
-
$(
GIT
REV
)
# Don't put .
git
subdirs into distribution package
dist-hook
:
rm
-rf
`
find
$(
distdir
)
-name
.
svn
`
rm
-rf
`
find
$(
distdir
)
-name
.
git
`
# Installation of DOXYGEN documentation
# Docu is not remade anymore at each occasion!
...
...
@@ -70,4 +70,4 @@ endif HAVE_DOXYGEN
MAINTAINERCLEANFILES
=
INSTALL config.h.in config.guess config.sub configure Makefile.in
\
depcomp install-sh ltmain.sh missing compile
\
aclocal.m4 m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
\
SVN
REV py-compile test-driver
GIT
REV py-compile test-driver
This diff is collapsed.
Click to expand it.
v2.0/toolkit/configure.ac
+
10
−
6
View file @
c89e5ae2
...
...
@@ -561,12 +561,16 @@ AM_CONDITIONAL(ENABLE_PYEXT, [test "x$enable_pyext" = "xyes"])
# Add subversion revision number, recipe from Autotools by J. Calcote
# Modified on 18.12.13 to fix changed behaviour of svnversion to give "Unversioned directory" instead of "exported"
SVNREV=`( svnversion $srcdir | sed 's/:.*//' ) 2>/dev/null`
if { ! ( svnversion ) >/dev/null 2>&1 || test "x$SVNREV" = "xexported" || test "x$SVNREV" = "xUnversioned directory"; } ;
then SVNREV=`cat $srcdir/SVNREV`
else echo $SVNREV>$srcdir/SVNREV
fi
AC_SUBST(SVNREV)
#SVNREV=`( svnversion $srcdir | sed 's/:.*//' ) 2>/dev/null`
#if { ! ( svnversion ) >/dev/null 2>&1 || test "x$SVNREV" = "xexported" || test "x$SVNREV" = "xUnversioned directory"; } ;
# then SVNREV=`cat $srcdir/SVNREV`
# else echo $SVNREV>$srcdir/SVNREV
#fi
#AC_SUBST(SVNREV)
GITREV=`git describe`
echo $GITREV>$srcdir/GITREV
AC_SUBST(GITREV)
# Initialize Doxygen doc
if test "x$DOXYGEN" != "x"; then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment