onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 16:13:13 +02:00
Code Issues Releases Wiki Activity

if ccache is present on the build system, passing "QMAKE_CXX=ccache g++" via qwmake.inc file rather than command line

Browse Source
This commit is contained in:
Vadim Kurland
2009-05-02 05:16:00 +00:00
parent 9a6da3f204
commit 10a9b7ca92
5 changed files with 96 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 846 #define BUILD_NUM 855
configure.in
+7 -4
View File
@@ -1,7 +1,8 @@
dnl $Id: configure.in,v 1.70 2007/06/07 02:33:53 vkurland Exp $ dnl $Id: configure.in,v 1.70 2007/06/07 02:33:53 vkurland Exp $
AC_INIT(src/gui/main.cpp) AC_INIT
AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/gui/main.cpp])
AC_CANONICAL_TARGET
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
PACKAGE=fwbuilder PACKAGE=fwbuilder
@@ -244,7 +245,7 @@ AC_DEFINE_UNQUOTED(LIBFWBUILDER_VERSION, "$LIBFWBUILDER_VERSION", [libfwbuilder_
AC_SUBST(LIBS) AC_SUBST(LIBS)
AC_LANG_CPLUSPLUS AC_LANG([C++])
AC_PATH_PROG(ANTLR_CONFIG, antlr-config, , [$EXTENDED_PATH]) AC_PATH_PROG(ANTLR_CONFIG, antlr-config, , [$EXTENDED_PATH])
AC_MSG_CHECKING(antlr) AC_MSG_CHECKING(antlr)
@@ -434,6 +435,7 @@ AC_SUBST(MANDIR)
AC_SUBST(ICONSDIR) AC_SUBST(ICONSDIR)
AC_PATH_PROG(CCACHE, ccache, , ) AC_PATH_PROG(CCACHE, ccache, , )
AC_SUBST(CCACHE)
dnl AC_CONFIG_FILES([ Main.make ]) dnl AC_CONFIG_FILES([ Main.make ])
AC_CONFIG_FILES([ qmake.inc ]) AC_CONFIG_FILES([ qmake.inc ])
@@ -471,5 +473,6 @@ AC_CONFIG_FILES([ src/res/platform/unknown.xml ])
AC_OUTPUT AC_OUTPUT
QMAKE=$QMAKE CCACHE=$CCACHE QTDIR=$QTDIR ./runqmake.sh # QMAKE=$QMAKE CCACHE=$CCACHE QTDIR=$QTDIR ./runqmake.sh
QMAKE=$QMAKE QTDIR=$QTDIR ./runqmake.sh
qmake.inc
+14 -25
View File
@@ -3,59 +3,52 @@
######### fwbuilder/qmake.inc.in ######### fwbuilder/qmake.inc.in
# #
QTDIR = $$(QTDIR) QTDIR = $$(QTDIR)
TEMPLATE = app TEMPLATE = app
SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
MANDIR = /private/var/tmp/src/fwb3-branch-v3/install_root/share/man/ MANDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/man/
DOCDIR = /private/var/tmp/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5
HAVE_ANTLR_RUNTIME = 1 HAVE_ANTLR_RUNTIME = 1
HAVE_EXTERNAL_ANTLR = 0 HAVE_EXTERNAL_ANTLR = 0
unix { unix {
ANTLR_INCLUDEPATH = /private/var/tmp/src/fwb3-branch-v3/source/fwbuilder/src/ PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root
ANTLR_LIBS = /private/var/tmp/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
ANTLR_INCLUDEPATH = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
FWBPARSER_LIB = ../parsers/libfwbparser.a FWBPARSER_LIB = ../parsers/libfwbparser.a
}
QMAKE_CXX = /usr/local/bin/ccache g++
unix {
!macx { !macx {
UI_DIR = .ui UI_DIR = .ui
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
PREFIX = /private/var/tmp/src/fwb3-branch-v3/install_root
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
ICONSDIR = ICONSDIR =
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /private/var/tmp/src/fwb3-branch-v3/install_root/include/ /private/var/tmp/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/private/var/tmp/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp LIBS_FWCOMPILER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
LIBS_FWBUILDER = -L/private/var/tmp/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp LIBS_FWBUILDER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
dtd.path = @TEMPLATE_DIR@/ dtd.path = @TEMPLATE_DIR@/
migration.path = @TEMPLATE_DIR@/migration migration.path = @TEMPLATE_DIR@/migration
doc.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5
datadir.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share/ datadir.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/
# win32:target.path = $$PREFIX/
# unix:target.path = $$PREFIX/share/fwbuilder/
# macx:target.path = $$PREFIX/
res.path = ../Resources res.path = ../Resources
res_os.path = ../Resources/os/ res_os.path = ../Resources/os/
res_platform.path = ../Resources/platform/ res_platform.path = ../Resources/platform/
res_help.path = ../Resources/help/ res_help.path = ../Resources/help/
res_desktop.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share//applications/ res_desktop.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share//applications/
INSTALLS += res INSTALLS += res
INSTALLS += res_os INSTALLS += res_os
@@ -73,10 +66,6 @@ unix {
} }
} }
macx {
PREFIX = /private/var/tmp/src/fwb3-branch-v3/install_root
}
win32 { win32 {
CONFIG -= debug CONFIG -= debug
} }
qmake.inc.in
+4 -15
View File
@@ -3,11 +3,8 @@
######### fwbuilder/qmake.inc.in ######### fwbuilder/qmake.inc.in
# #
QTDIR = $$(QTDIR) QTDIR = $$(QTDIR)
TEMPLATE = app TEMPLATE = app
SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
@@ -18,19 +15,20 @@ HAVE_ANTLR_RUNTIME = @HAVE_ANTLR_RUNTIME@
HAVE_EXTERNAL_ANTLR = @HAVE_EXTERNAL_ANTLR@ HAVE_EXTERNAL_ANTLR = @HAVE_EXTERNAL_ANTLR@
unix { unix {
PREFIX = @PREFIX@
ANTLR_INCLUDEPATH = @ANTLR_INCLUDEPATH@ ANTLR_INCLUDEPATH = @ANTLR_INCLUDEPATH@
ANTLR_LIBS = @ANTLR_LIBS@ ANTLR_LIBS = @ANTLR_LIBS@
FWBPARSER_LIB = ../parsers/libfwbparser.a FWBPARSER_LIB = ../parsers/libfwbparser.a
}
QMAKE_CXX = @CCACHE@ g++
unix {
!macx { !macx {
UI_DIR = .ui UI_DIR = .ui
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
PREFIX = @PREFIX@
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
ICONSDIR = @ICONSDIR@ ICONSDIR = @ICONSDIR@
@@ -46,11 +44,6 @@ unix {
doc.path = @DOCDIR@ doc.path = @DOCDIR@
datadir.path = @DATADIR@ datadir.path = @DATADIR@
# win32:target.path = $$PREFIX/
# unix:target.path = $$PREFIX/share/fwbuilder/
# macx:target.path = $$PREFIX/
res.path = @RES_DIR@ res.path = @RES_DIR@
res_os.path = @RES_DIR@/os/ res_os.path = @RES_DIR@/os/
res_platform.path = @RES_DIR@/platform/ res_platform.path = @RES_DIR@/platform/
@@ -73,10 +66,6 @@ unix {
} }
} }
macx {
PREFIX = @PREFIX@
}
win32 { win32 {
CONFIG -= debug CONFIG -= debug
} }
runqmake.sh
-1
View File
@@ -3,7 +3,6 @@
test -z "${QMAKE}" && QMAKE="qmake" test -z "${QMAKE}" && QMAKE="qmake"
C="-recursive" C="-recursive"
test -n "$QMAKESPEC" && C="$C -spec $QMAKESPEC " test -n "$QMAKESPEC" && C="$C -spec $QMAKESPEC "
test -n "$CCACHE" && C="$C QMAKE_CXX='ccache g++' "
echo "QTDIR=\"$QTDIR\"" echo "QTDIR=\"$QTDIR\""
echo "Running qmake: $QMAKE $C" echo "Running qmake: $QMAKE $C"