1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split TARGET_BASEPATH from breakpad.

Browse Source 
TARGET_BASEPATH becomes QMAKE_RESOLVED_TARGET.

QMAKE_RESOLVED_TARGET will be reused for future implementation
of code coverage tool TestCocoon.

Creating of resolve_target.prf.

Clean unused "unset(SYMBOLFILENAME)" in default_post.prf.

Change-Id: I054efb0065fa06697b60ac60a9ddf364f2f40366
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Caroline Chao 2011-07-05 16:15:52 +02:00 committed by Qt by Nokia
parent d457f148cf
commit f3b46a0f4d
2 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
mkspecs/features/default_post.prf
View File

@ -19,64 +19,15 @@ incredibuild_xge {
} }
breakpad { breakpad {
!contains(DESTDIR, (/|.:[/\\\\]).*):TARGET_BASEPATH = $${OUT_PWD}/ load(resolve_target)
!isEmpty(DESTDIR):TARGET_BASEPATH = $${TARGET_BASEPATH}$${DESTDIR}/
win32 { win32 {
TARGET_BASEPATH ~= s,/,\\, DEBUGFILENAME = $${QMAKE_RESOLVED_TARGET}
contains(TEMPLATE, .*lib) { PDBFILENAME = $$replace(QMAKE_RESOLVED_TARGET, ...$, pdb)
isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) {
TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0)
isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT)
}
TARGET_EXT = .dll
} else {
TARGET_EXT = .exe
}
DEBUGFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}$${TARGET_EXT}
PDBFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}.pdb
DEBUGFILENAME ~= s,/,\\, DEBUGFILENAME ~= s,/,\\,
PDBFILENAME ~= s,/,\\, PDBFILENAME ~= s,/,\\,
QMAKE_CLEAN += $$PDBFILENAME # for the debug case it is hardcoded in qmake QMAKE_CLEAN += $$PDBFILENAME # for the debug case it is hardcoded in qmake
} else { } else {
contains(TEMPLATE, .*lib):LIBPREFIX = lib DEBUGFILENAME = $$QMAKE_RESOLVED_TARGET
macx {
equals(TEMPLATE, lib) {
lib_bundle {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
} else {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
!plugin {
TEMP_VERSION = $$section(VERSION, ., 0, 0)
isEmpty(TEMP_VERSION):TEMP_VERSION = 1
TARGET_BASEPATH = $${TARGET_BASEPATH}.$${TEMP_VERSION}
}
TARGET_BASEPATH = $${TARGET_BASEPATH}.$${QMAKE_EXTENSION_SHLIB}
}
} else {
app_bundle {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
} else {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
}
}
DEBUGFILENAME = $$TARGET_BASEPATH
} else {
equals(TEMPLATE, lib) {
plugin {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
} else {
TEMP_VERSION = $$VERSION
isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
}
} else {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
}
DEBUGFILENAME = $$TARGET_BASEPATH
}
} }
PROJECTPATH = $$OUT_PWD PROJECTPATH = $$OUT_PWD
@ -85,12 +36,6 @@ breakpad {
!isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t) !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)
QMAKE_POST_LINK = $$QMAKE_POST_LINK$$quote($${QT_BREAKPAD_ROOT_PATH}$${QMAKE_DIR_SEP}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\") QMAKE_POST_LINK = $$QMAKE_POST_LINK$$quote($${QT_BREAKPAD_ROOT_PATH}$${QMAKE_DIR_SEP}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\")
!isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP \"$$DEBUGFILENAME\") !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP \"$$DEBUGFILENAME\")
unset(TARGET_BASEPATH)
unset(SYMBOLFILENAME)
unset(TARGET_EXT)
unset(TARGET_VERSION_EXT)
unset(TEMP_VERSION)
} }
QMAKE_INCDIR += $$QMAKE_INCDIR_POST QMAKE_INCDIR += $$QMAKE_INCDIR_POST

58
mkspecs/features/resolve_target.prf Normal file
View File

@ -0,0 +1,58 @@
!contains(DESTDIR, (/|.:[/\\\\]).*):QMAKE_RESOLVED_TARGET = $${OUT_PWD}/
!isEmpty(DESTDIR):QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${DESTDIR}/
win32 {
QMAKE_RESOLVED_TARGET ~= s,/,\\,
contains(TEMPLATE, .*lib) {
isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) {
TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0)
isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT)
}
TARGET_EXT = .dll
} else {
TARGET_EXT = .exe
}
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}$${TARGET_VERSION_EXT}$${TARGET_EXT}
} else {
contains(TEMPLATE, .*lib):LIBPREFIX = lib
macx {
equals(TEMPLATE, lib) {
lib_bundle {
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}.framework/$${TARGET}
} else {
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}
!plugin {
TEMP_VERSION = $$section(VERSION, ., 0, 0)
isEmpty(TEMP_VERSION):TEMP_VERSION = 1
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${TEMP_VERSION}
}
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${QMAKE_EXTENSION_SHLIB}
}
} else {
app_bundle {
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}.app/Contents/MacOS/$${TARGET}
} else {
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}
}
}
} else {
equals(TEMPLATE, lib) {
plugin {
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.so
} else {
TEMP_VERSION = $$VERSION
isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
}
} else {
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}
}
}
}
unset(TARGET_VERSION_EXT)
unset(TARGET_EXT)
unset(LIBPREFIX)
unset(TEMP_VERSION)