onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2025-10-16 07:28:25 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 846
#define BUILD_NUM 855

11
configure.in
View File

@ -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
@ -244,7 +245,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)
@ -434,6 +435,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 ])
@ -471,5 +473,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

101
qmake.inc
View File

@ -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 {

97
qmake.inc.in
View File

@ -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 {

1
runqmake.sh
View File

@ -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"