]>
Commit | Line | Data |
---|---|---|
c6933216 JR |
1 | --- mod_python-3.4.1/src/Makefile.in~ 2013-10-23 04:33:52.000000000 +0200 |
2 | +++ mod_python-3.4.1/src/Makefile.in 2013-11-04 14:50:49.165054840 +0100 | |
3 | @@ -64,16 +64,14 @@ | |
4 | rm -f Makefile .depend | |
5 | ||
6 | version.c: | |
7 | - @MP_GIT_SHA=$$(git describe --always); \ | |
8 | echo > version.c ; \ | |
9 | echo "/* THIS FILE IS AUTO-GENERATED BY Makefile */" >> version.c ; \ | |
10 | echo "#include \"mp_version.h\"" >> version.c ; \ | |
11 | - echo "const char * const mp_git_sha = \"$${MP_GIT_SHA}\";" >> version.c ; \ | |
12 | echo "const int mp_version_major = MP_VERSION_MAJOR;" >> version.c ; \ | |
13 | echo "const int mp_version_minor = MP_VERSION_MINOR;" >> version.c ; \ | |
14 | echo "const int mp_version_patch = MP_VERSION_PATCH;" >> version.c ; \ | |
15 | - echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c ; \ | |
16 | - echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c | |
17 | + echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH);" >> version.c ; \ | |
18 | + echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH);" >> version.c | |
19 | ||
20 | # echo "const char * const mp_version_component = \"mod_python/\" #MP_VERSION_MAJOR \".\" #MP_VERSION_MINOR \".\" #MP_VERSION_PATCH \"-$${MP_GIT_SHA}\";" >> version.c | |
21 | ||
22 | --- mod_python-3.4.1/src/include/mod_python.h.in~ 2013-10-23 04:33:52.000000000 +0200 | |
23 | +++ mod_python-3.4.1/src/include/mod_python.h.in 2013-11-04 14:51:56.792279692 +0100 | |
24 | @@ -133,7 +133,6 @@ | |
25 | #endif | |
26 | ||
27 | /* version stuff */ | |
28 | -extern const char * const mp_git_sha; | |
29 | extern const int mp_version_major; | |
30 | extern const int mp_version_minor; | |
31 | extern const int mp_version_patch; | |
f80f6a36 JR |
32 | --- mod_python-3.4.1/dist/version.sh~ 2013-10-23 04:33:52.000000000 +0200 |
33 | +++ mod_python-3.4.1/dist/version.sh 2013-11-04 15:07:59.670516345 +0100 | |
34 | @@ -5,6 +5,5 @@ | |
35 | MAJ=`awk '/MP_VERSION_MAJOR/ {print $3}' $MPV_PATH` | |
36 | MIN=`awk '/MP_VERSION_MINOR/ {print $3}' $MPV_PATH` | |
37 | PCH=`awk '/MP_VERSION_PATCH/ {print $3}' $MPV_PATH` | |
38 | -GIT=`git describe --always` | |
39 | ||
40 | -echo $MAJ.$MIN.$PCH-$GIT | |
41 | +echo $MAJ.$MIN.$PCH |