projects / packages / apache-mod_python.git / blame
| Commit | Line | Data |
|---|---|---|
| 97e00cf4 JR |
1 | diff -urNp -x '*.orig' mod_python-3.5.0.org/dist/version.sh mod_python-3.5.0/dist/version.sh |
| 2 | --- mod_python-3.5.0.org/dist/version.sh 2013-11-12 04:21:34.000000000 +0100 | |
| 3 | +++ mod_python-3.5.0/dist/version.sh 2021-03-02 22:05:35.543365926 +0100 | |
| 4 | @@ -5,6 +5,5 @@ MPV_PATH="`dirname $0`/../src/include/mp | |
| 5 | MAJ=`awk '/MP_VERSION_MAJOR/ {print $3}' $MPV_PATH` | |
| 6 | MIN=`awk '/MP_VERSION_MINOR/ {print $3}' $MPV_PATH` | |
| 7 | PCH=`awk '/MP_VERSION_PATCH/ {print $3}' $MPV_PATH` | |
| 8 | -GIT=`git describe --always` | |
| 9 | ||
| 10 | -echo $MAJ.$MIN.$PCH-$GIT | |
| 11 | +echo $MAJ.$MIN.$PCH | |
| 12 | diff -urNp -x '*.orig' mod_python-3.5.0.org/src/Makefile.in mod_python-3.5.0/src/Makefile.in | |
| 13 | --- mod_python-3.5.0.org/src/Makefile.in 2013-11-12 04:21:34.000000000 +0100 | |
| 14 | +++ mod_python-3.5.0/src/Makefile.in 2021-03-02 22:05:35.543365926 +0100 | |
| 15 | @@ -64,16 +64,14 @@ distclean: clean | |
| c6933216 JR |
16 | rm -f Makefile .depend |
| 17 | ||
| 18 | version.c: | |
| 19 | - @MP_GIT_SHA=$$(git describe --always); \ | |
| 20 | echo > version.c ; \ | |
| 21 | echo "/* THIS FILE IS AUTO-GENERATED BY Makefile */" >> version.c ; \ | |
| 22 | echo "#include \"mp_version.h\"" >> version.c ; \ | |
| 23 | - echo "const char * const mp_git_sha = \"$${MP_GIT_SHA}\";" >> version.c ; \ | |
| 24 | echo "const int mp_version_major = MP_VERSION_MAJOR;" >> version.c ; \ | |
| 25 | echo "const int mp_version_minor = MP_VERSION_MINOR;" >> version.c ; \ | |
| 26 | echo "const int mp_version_patch = MP_VERSION_PATCH;" >> version.c ; \ | |
| 27 | - echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c ; \ | |
| 28 | - 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 | |
| 29 | + echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH);" >> version.c ; \ | |
| 30 | + echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH);" >> version.c | |
| 31 | ||
| 32 | # echo "const char * const mp_version_component = \"mod_python/\" #MP_VERSION_MAJOR \".\" #MP_VERSION_MINOR \".\" #MP_VERSION_PATCH \"-$${MP_GIT_SHA}\";" >> version.c | |
| 33 | ||
| 97e00cf4 JR |
34 | diff -urNp -x '*.orig' mod_python-3.5.0.org/src/include/mod_python.h.in mod_python-3.5.0/src/include/mod_python.h.in |
| 35 | --- mod_python-3.5.0.org/src/include/mod_python.h.in 2013-11-12 04:21:34.000000000 +0100 | |
| 36 | +++ mod_python-3.5.0/src/include/mod_python.h.in 2021-03-02 22:05:35.543365926 +0100 | |
| 37 | @@ -156,7 +156,6 @@ extern module AP_MODULE_DECLARE_DATA pyt | |
| 38 | #define MUTEX_DIR "@MUTEX_DIR@" | |
| c6933216 JR |
39 | |
| 40 | /* version stuff */ | |
| 41 | -extern const char * const mp_git_sha; | |
| 42 | extern const int mp_version_major; | |
| 43 | extern const int mp_version_minor; | |
| 44 | extern const int mp_version_patch; |