From 00c5ce8f1871af61dbf65cab29f7beb25404efaf Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sat, 2 May 2009 04:25:48 +0000 Subject: [PATCH] if ccache is present on the build system, passing "QMAKE_CXX=ccache g++" via qwmake.inc file rather than command line --- build_num | 2 +- configure.in | 11 ++++-- qmake.inc | 101 +++++++++++++++++++++++---------------------------- qmake.inc.in | 97 ++++++++++++++++++++++--------------------------- runqmake.sh | 1 - 5 files changed, 96 insertions(+), 116 deletions(-) diff --git a/build_num b/build_num index 48b5fd89a..7fc7c9cab 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 846 +#define BUILD_NUM 855 diff --git a/configure.in b/configure.in index 604e3fc57..a83bed21f 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,8 @@ dnl $Id: configure.in,v 1.70 2007/06/07 02:33:53 vkurland Exp $ -AC_INIT(src/gui/main.cpp) -AC_CANONICAL_SYSTEM +AC_INIT +AC_CONFIG_SRCDIR([src/gui/main.cpp]) +AC_CANONICAL_TARGET AC_CONFIG_HEADER(config.h) PACKAGE=fwbuilder @@ -247,7 +248,7 @@ AC_DEFINE_UNQUOTED(LIBFWBUILDER_VERSION, "$LIBFWBUILDER_VERSION", [libfwbuilder_ AC_SUBST(LIBS) -AC_LANG_CPLUSPLUS +AC_LANG([C++]) AC_PATH_PROG(ANTLR_CONFIG, antlr-config, , [$EXTENDED_PATH]) AC_MSG_CHECKING(antlr) @@ -437,6 +438,7 @@ AC_SUBST(MANDIR) AC_SUBST(ICONSDIR) AC_PATH_PROG(CCACHE, ccache, , ) +AC_SUBST(CCACHE) dnl AC_CONFIG_FILES([ Main.make ]) AC_CONFIG_FILES([ qmake.inc ]) @@ -466,5 +468,6 @@ AC_CONFIG_FILES([ src/res/platform/unknown.xml ]) AC_OUTPUT -QMAKE=$QMAKE CCACHE=$CCACHE QTDIR=$QTDIR ./runqmake.sh +# QMAKE=$QMAKE CCACHE=$CCACHE QTDIR=$QTDIR ./runqmake.sh +QMAKE=$QMAKE QTDIR=$QTDIR ./runqmake.sh diff --git a/qmake.inc b/qmake.inc index 83e640584..678231c71 100644 --- a/qmake.inc +++ b/qmake.inc @@ -2,79 +2,68 @@ # ######### fwbuilder/qmake.inc.in # -QTDIR = $$(QTDIR) - -TEMPLATE = app - -SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ - -DEFINES += $$(DEFINES) -LANGUAGE = C++ -UI_DIR = ui -MANDIR = /private/var/tmp/src/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /private/var/tmp/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 +QTDIR = $$(QTDIR) +TEMPLATE = app +SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ +DEFINES += $$(DEFINES) +LANGUAGE = C++ +UI_DIR = ui +MANDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/man/ +DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /private/var/tmp/src/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /private/var/tmp/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root + + 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 -} + QMAKE_CXX = /usr/local/bin/ccache g++ -unix { -!macx { - UI_DIR = .ui - MOC_DIR = .moc - OBJECTS_DIR = .obj + !macx { - PREFIX = /private/var/tmp/src/fwb3-branch-v3/install_root - exec_prefix = @EXEC_PREFIX@ - DESTDIR = - ICONSDIR = + UI_DIR = .ui + MOC_DIR = .moc + OBJECTS_DIR = .obj - 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 + exec_prefix = @EXEC_PREFIX@ + DESTDIR = + ICONSDIR = - LIBS_FWCOMPILER = -L/private/var/tmp/src/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 + 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 - target.path = $$PREFIX/bin - dtd.path = @TEMPLATE_DIR@/ - migration.path = @TEMPLATE_DIR@/migration - doc.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 - datadir.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share/ + 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/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + target.path = $$PREFIX/bin + dtd.path = @TEMPLATE_DIR@/ + migration.path = @TEMPLATE_DIR@/migration + doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 + 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_os.path = ../Resources/os/ + res_platform.path = ../Resources/platform/ + res_help.path = ../Resources/help/ + res_desktop.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share//applications/ - res.path = ../Resources - res_os.path = ../Resources/os/ - res_platform.path = ../Resources/platform/ - res_help.path = ../Resources/help/ - res_desktop.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share//applications/ + INSTALLS += res + INSTALLS += res_os + INSTALLS += res_platform + # INSTALLS += icns + LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll - INSTALLS += res - INSTALLS += res_os - INSTALLS += res_platform -# INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll + PKGLOCALEDIR = $$res.path/locale - PKGLOCALEDIR = $$res.path/locale - - CONFIG += warn_on debug - QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -g -O2 - QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -g -O2 -} -} - -macx { - PREFIX = /private/var/tmp/src/fwb3-branch-v3/install_root + CONFIG += warn_on debug + QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter + QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter + QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -g -O2 + QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -g -O2 + } } win32 { diff --git a/qmake.inc.in b/qmake.inc.in index dfd4869fb..40957044c 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -2,79 +2,68 @@ # ######### fwbuilder/qmake.inc.in # -QTDIR = $$(QTDIR) - -TEMPLATE = app - -SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ - -DEFINES += $$(DEFINES) -LANGUAGE = C++ -UI_DIR = ui -MANDIR = @MANDIR@ -DOCDIR = @DOCDIR@ +QTDIR = $$(QTDIR) +TEMPLATE = app +SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ +DEFINES += $$(DEFINES) +LANGUAGE = C++ +UI_DIR = ui +MANDIR = @MANDIR@ +DOCDIR = @DOCDIR@ HAVE_ANTLR_RUNTIME = @HAVE_ANTLR_RUNTIME@ HAVE_EXTERNAL_ANTLR = @HAVE_EXTERNAL_ANTLR@ unix { + PREFIX = @PREFIX@ + ANTLR_INCLUDEPATH = @ANTLR_INCLUDEPATH@ ANTLR_LIBS = @ANTLR_LIBS@ FWBPARSER_LIB = ../parsers/libfwbparser.a -} + QMAKE_CXX = @CCACHE@ g++ -unix { -!macx { - UI_DIR = .ui - MOC_DIR = .moc - OBJECTS_DIR = .obj + !macx { - PREFIX = @PREFIX@ - exec_prefix = @EXEC_PREFIX@ - DESTDIR = - ICONSDIR = @ICONSDIR@ + UI_DIR = .ui + MOC_DIR = .moc + OBJECTS_DIR = .obj - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@ + exec_prefix = @EXEC_PREFIX@ + DESTDIR = + ICONSDIR = @ICONSDIR@ - LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@ - LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@ + INCLUDEPATH += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@ - target.path = $$PREFIX/bin - dtd.path = @TEMPLATE_DIR@/ - migration.path = @TEMPLATE_DIR@/migration - doc.path = @DOCDIR@ - datadir.path = @DATADIR@ + LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@ + LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@ + target.path = $$PREFIX/bin + dtd.path = @TEMPLATE_DIR@/ + migration.path = @TEMPLATE_DIR@/migration + doc.path = @DOCDIR@ + datadir.path = @DATADIR@ -# win32:target.path = $$PREFIX/ -# unix:target.path = $$PREFIX/share/fwbuilder/ -# macx:target.path = $$PREFIX/ + res.path = @RES_DIR@ + res_os.path = @RES_DIR@/os/ + res_platform.path = @RES_DIR@/platform/ + res_help.path = @RES_DIR@/help/ + res_desktop.path = @DATADIR@/applications/ - res.path = @RES_DIR@ - res_os.path = @RES_DIR@/os/ - res_platform.path = @RES_DIR@/platform/ - res_help.path = @RES_DIR@/help/ - res_desktop.path = @DATADIR@/applications/ + INSTALLS += res + INSTALLS += res_os + INSTALLS += res_platform + # INSTALLS += icns + LIBS += $$LIBS_FWBUILDER @LIBS@ - INSTALLS += res - INSTALLS += res_os - INSTALLS += res_platform -# INSTALLS += icns - LIBS += $$LIBS_FWBUILDER @LIBS@ + PKGLOCALEDIR = $$res.path/locale - PKGLOCALEDIR = $$res.path/locale - - CONFIG += warn_on debug - QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ - QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@ -} -} - -macx { - PREFIX = @PREFIX@ + CONFIG += warn_on debug + QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter + QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter + QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ + QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@ + } } win32 { diff --git a/runqmake.sh b/runqmake.sh index 0a90adafd..c841f4196 100755 --- a/runqmake.sh +++ b/runqmake.sh @@ -3,7 +3,6 @@ test -z "${QMAKE}" && QMAKE="qmake" C="-recursive" test -n "$QMAKESPEC" && C="$C -spec $QMAKESPEC " -test -n "$CCACHE" && C="$C QMAKE_CXX='ccache g++' " echo "QTDIR=\"$QTDIR\"" echo "Running qmake: $QMAKE $C"