mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/subsurface-gen-version.pri

41 lines
2.2 KiB
Text
Raw Normal View History

Dependencies are too aggressive for version.h Apparently qmake can't tell that #include "version.h" and #include "libdivecomputer/version.h" are not the same thing. Instead of spending another bunch of hours on fixing the buildsystem I decided to just cleanup the spots where we actually use the version file and rename it to ssrf-version.h. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-16 02:54:15 +00:00
# Generate the ssrf-version.h file
VERSION_FILE = ssrf-version.h
subsurface-gen-version.pri: pass the current OS to get-version We check the current OS and pass it as 'darwin' (osx), 'linux' or 'win' to the get-version shell script. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-10 14:07:25 +00:00
macx: VER_OS = darwin
unix: !macx: VER_OS = linux
win32: VER_OS = win
Implement a qmake-based build for Subsurface This is working for me, but requires a bit more testing. To build, run: qmake [options] Where options might be: V=1 disable "silent" build LIBDCDEVEL=1 use side-by-side libdivecomputer INCLUDEPATH+=xxx add -Ixxx (e.g., INCLUDEPATH+=/usr/local/marble/include) LIBS+=xxx add xxx to the linker flags (e.g. LIBS+=-L/usr/local/marble/lib) or any other qmake option, including debug and release options If your distribution is already using qtchooser in place of qmake, you may need to pass an extra option to qmake to select the a cross-build. For example: qmake -qt=i686-w64-mingw32-qt4 If your distribution is not yet using qtchooser, then you need to file a bug report requesting it and you need to run the full path to qmake. Note: - there are some ### left in the buildsystem Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-10-07 00:52:34 +00:00
exists(.git/HEAD): {
qmake: use real tabs for all .pri files subsurface.pro already useses that. For consistency with the app, we use swap 4 spaces with a tab character for indentation. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-03 21:00:22 +00:00
win32: SET_GIT_DIR = set GIT_DIR
else: SET_GIT_DIR = GIT_DIR
GIT_HEAD = .git/HEAD
VERSION_SCRIPT = $$PWD/scripts/get-version
# always use linux here -------------------vvv so we get the true full version
FULL_VERSION = "`$$VERSION_SCRIPT linux`"
Create better version numbering for Windows I don't think this will be a problem for the other OSs, but it needs a bit more testing, especially on the Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-10-29 19:51:45 +00:00
VERSION = $$system("sh scripts/get-version full || echo $${VERSION}")
Fix building in git shallow clones If we are building from a shallow clone, just guess the version based on whats hard-coded in VERSION and append a -git to show thats it somwhere behind that. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-01-20 12:19:09 +00:00
PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || echo $${VERSION}.0.0-git")
VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || echo $${VERSION}-git")
qmake: use real tabs for all .pri files subsurface.pro already useses that. For consistency with the app, we use swap 4 spaces with a tab character for indentation. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-03 21:00:22 +00:00
version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD")
Fix building in git shallow clones If we are building from a shallow clone, just guess the version based on whats hard-coded in VERSION and append a -git to show thats it somwhere behind that. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-01-20 12:19:09 +00:00
version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS || echo $$VERSION-git`\\\" > ${QMAKE_FILE_OUT}
Try to bring some sanity into our version strings VERSION_STRING is the one most appropriate for the target OS GIT_VERSION_STRING is the full version string with the git hash CANONICAL_VERSION_STRING is major.minor.submior.number_of_commits Mac allows only three components to the version Windows allows four Linux doesn't care This way we always know the full git hash (unless tagged or from tar) AND we can always have a version that can be easily compared / sorted. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 19:42:04 +00:00
version_h.commands += $$escape_expand(\\n)$$escape_expand(\\t)
version_h.commands += echo \\$${LITERAL_HASH}define GIT_VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT linux || echo $$VERSION-git`\\\" >> ${QMAKE_FILE_OUT}
version_h.commands += $$escape_expand(\\n)$$escape_expand(\\t)
version_h.commands += echo \\$${LITERAL_HASH}define CANONICAL_VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT full || echo $$VERSION-git`\\\" >> ${QMAKE_FILE_OUT}
qmake: use real tabs for all .pri files subsurface.pro already useses that. For consistency with the app, we use swap 4 spaces with a tab character for indentation. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-03 21:00:22 +00:00
version_h.input = GIT_HEAD
version_h.output = $$VERSION_FILE
version_h.variable_out = GENERATED_FILES
version_h.CONFIG = ignore_no_exist
QMAKE_EXTRA_COMPILERS += version_h
Implement a qmake-based build for Subsurface This is working for me, but requires a bit more testing. To build, run: qmake [options] Where options might be: V=1 disable "silent" build LIBDCDEVEL=1 use side-by-side libdivecomputer INCLUDEPATH+=xxx add -Ixxx (e.g., INCLUDEPATH+=/usr/local/marble/include) LIBS+=xxx add xxx to the linker flags (e.g. LIBS+=-L/usr/local/marble/lib) or any other qmake option, including debug and release options If your distribution is already using qtchooser in place of qmake, you may need to pass an extra option to qmake to select the a cross-build. For example: qmake -qt=i686-w64-mingw32-qt4 If your distribution is not yet using qtchooser, then you need to file a bug report requesting it and you need to run the full path to qmake. Note: - there are some ### left in the buildsystem Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-10-07 00:52:34 +00:00
} else {
qmake: use real tabs for all .pri files subsurface.pro already useses that. For consistency with the app, we use swap 4 spaces with a tab character for indentation. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-03 21:00:22 +00:00
# This is probably a package
Ubuntu packaging: get git version without including the full git tree Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02 23:26:43 +00:00
exists(.gitversion): {
FULL_VERSION = $$system("cat .gitversion")
} else {
FULL_VERSION = $$VERSION
}
Try to bring some sanity into our version strings VERSION_STRING is the one most appropriate for the target OS GIT_VERSION_STRING is the full version string with the git hash CANONICAL_VERSION_STRING is major.minor.submior.number_of_commits Mac allows only three components to the version Windows allows four Linux doesn't care This way we always know the full git hash (unless tagged or from tar) AND we can always have a version that can be easily compared / sorted. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 19:42:04 +00:00
CANONICAL_VERSION = $$system("sh scripts/get-version full $$FULL_VERSION")
OS_USABLE_VERSION = $$system("sh scripts/get-version $$VER_OS $$FULL_VERSION")
system(echo \\$${LITERAL_HASH}define VERSION_STRING \\\"$$OS_USABLE_VERSION\\\" > $$VERSION_FILE)
system(echo \\$${LITERAL_HASH}define GIT_VERSION_STRING \\\"$$FULL_VERSION\\\" >> $$VERSION_FILE)
system(echo \\$${LITERAL_HASH}define CANONICAL_VERSION_STRING \\\"$$CANONICAL_VERSION\\\" >> $$VERSION_FILE)
make clean should also remove ssrf-version.h Regardless if we are building from git or from a tar file. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-21 11:00:46 +00:00
QMAKE_CLEAN += $$VERSION_FILE
Implement a qmake-based build for Subsurface This is working for me, but requires a bit more testing. To build, run: qmake [options] Where options might be: V=1 disable "silent" build LIBDCDEVEL=1 use side-by-side libdivecomputer INCLUDEPATH+=xxx add -Ixxx (e.g., INCLUDEPATH+=/usr/local/marble/include) LIBS+=xxx add xxx to the linker flags (e.g. LIBS+=-L/usr/local/marble/lib) or any other qmake option, including debug and release options If your distribution is already using qtchooser in place of qmake, you may need to pass an extra option to qmake to select the a cross-build. For example: qmake -qt=i686-w64-mingw32-qt4 If your distribution is not yet using qtchooser, then you need to file a bug report requesting it and you need to run the full path to qmake. Note: - there are some ### left in the buildsystem Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-10-07 00:52:34 +00:00
}
Reference in a new issue Copy permalink