From 713655baa71c51387f10bb242e2534bb7e9d8a94 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 24 Jun 2010 02:47:32 +0000 Subject: [PATCH] Update configure and add links --- configure | 57 +++++-- docs | 1 + externals | 1 + src/interface/Settings_window.cpp | 2 +- src/src.pro | 254 +++++++++++++++--------------- 5 files changed, 172 insertions(+), 143 deletions(-) create mode 120000 docs create mode 120000 externals diff --git a/configure b/configure index 7c7a118..389f71b 100755 --- a/configure +++ b/configure @@ -48,10 +48,21 @@ WHICH=`which which 2>/dev/null` UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown makefile="Makefile" +# Default values with_otf=0 +otfdir="/usr" +otfincdir="$otfdir/include" +otflibdir="$otfdir/lib" + with_tau=0 -with_otf_include_default=1 -with_otf_lib_default=1 +taudir="/usr" +tauincdir="$taudir/include" +taulibdir="$taudir/lib" + +qtcolordir="./externals/qtcolorpicker/" +qtcolorincdir="$qtcolordir/src" +qtcolorsrcdir="$qtcolordir/src" + config_specified=0 # where will we concatenate options like macros, libs... @@ -105,7 +116,7 @@ usage() echo " makes the rabbit to turn when no trace is loaded" echo "" echo " --enable_otf" - echo " enables the otf support (You can find an OTF release in the src/general directory)" + echo " enables the otf support (An OTF release is provided in the externals/otf directory)" echo "" echo " --otf_dir=" echo " path to the OTF library" @@ -178,6 +189,18 @@ while [ 0 -lt $# ]; do --tau_libdir=*) taulibdir=`echo $OPT | awk -F"--tau_libdir=" '{print $2}'` ;; + # Internal options (Don't appear in --help) + --qtcolor_dir=*) # qtcol directory + qtcolordir=`echo $OPT | awk -F"--qtcolor_dir=" '{print $2}'` + qtcolorincdir="$qtcolordir/include" + qtcolorlibdir="$qtcolordir/lib" + ;; + --qtcolor_incdir=*) # qtcolor include directory + qtcolorincdir=`echo $OPT | awk -F"--qtcolor_incdir=" '{print $2}'` + ;; + --qtcolor_libdir=*) + qtcolorlibdir=`echo $OPT | awk -F"--qtcolor_libdir=" '{print $2}'` + ;; *) echo "invalid option : $OPT"; exit 0; @@ -192,16 +215,20 @@ else config="$config release\""; fi +# +# External libraries +# + +# OTF if [ $with_otf = 1 ]; then defines="$defines WITH_OTF" sources="$sources parser/ParserOTF.cpp parser/ParserEventOTF.cpp parser/ParserDefinitionOTF.cpp" headers="$headers parser/ParserOTF.hpp parser/ParserEventOTF.hpp parser/ParserDefinitionOTF.hpp" includepath="$includepath $otfincdir" - #dependpath="$dependpath $otfincdir" libs="$libs -L$otflibdir -lotf" - #compilation_src_pro="\"DEFINES+=WITH_OTF\" \"LIBS+=general/otf/otflib/.libs/libotf.a -Lgeneral/otf/otflib/.libs\" \"SOURCES+=parser/ParserOTF.cpp parser/ParserEventOTF.cpp parser/ParserDefinitionOTF.cpp\" \"HEADERS+=parser/ParserOTF.hpp parser/ParserEventOTF.hpp parser/ParserDefinitionOTF.hpp\" src.pro " fi +# TAU if [ $with_tau = 1 ] then defines="$defines WITH_TAU" @@ -211,6 +238,14 @@ then libs="$libs -L$taulibdir -lTAU_tf" fi +# QT Color Picker +dependpath="$dependpath $qtcolorsrcdir" +includepath="$includepath $qtcolorincdir" + +# +# End External libraries +# + defines="$defines\""; libs="$libs\""; includepath="$includepath\""; @@ -276,7 +311,7 @@ fi @echo "Compilation completed! File created in 'bin' folder." @echo " " -DOCUMENTATION = ../documentation/ +DOCUMENTATION = ./docs/ doc: doxygen Doxyfile make -C \$(DOCUMENTATION)/latex @@ -294,15 +329,9 @@ clean: @echo "Cleaned!" @echo " " - cleanall: clean EOF -if [ $with_otf = 1 -a $with_otf_lib_default = 1 ]; then - cat >>"$makefile" <>"$makefile" <>"$makefile" <>"$makefile" < #include /* -- */ -#include "qtcolorpicker/src/qtcolorpicker.h" +#include /* -- */ #include "trace/values/Values.hpp" #include "trace/EntityValue.hpp" diff --git a/src/src.pro b/src/src.pro index bac4e65..2b54fec 100644 --- a/src/src.pro +++ b/src/src.pro @@ -52,8 +52,8 @@ TEMPLATE = app TARGET = vite #macx:QMAKE_LIBS_OPENGL += -framework GLUT -lobjc macx:QMAKE_LIBS_OPENGL += -framework -lobjc -DEPENDPATH += . common interface parser trace trace/values trace/tree info render statistics ../../externals ../../../externals -INCLUDEPATH += . ../../externals ../../../externals +DEPENDPATH += . +INCLUDEPATH += . QMAKE_CFLAGS += -O2 -fPIC -Wall QMAKE_CXXFLAGS += -O2 -fPIC -Wall @@ -67,162 +67,164 @@ macx { } # Input -HEADERS += common/common.hpp \ - common/Message.hpp \ - common/Errors.hpp \ - common/Tools.hpp \ - common/info.hpp \ - common/Session.hpp \ +HEADERS += common/common.hpp \ + common/Message.hpp \ + common/Errors.hpp \ + common/Tools.hpp \ + common/info.hpp \ + common/Session.hpp \ # Interface headers - interface/interface.hpp \ - interface/Settings_window.hpp \ + interface/interface.hpp \ + interface/Settings_window.hpp \ interface/Interface_graphic.hpp \ - interface/resource.hpp \ + interface/resource.hpp \ # Core header - core/Core.hpp \ + core/Core.hpp \ # Render headers - render/Palette.hpp \ - render/Render.hpp \ - render/Geometry.hpp \ - render/Ruler.hpp \ - render/Hook_event.hpp \ - render/Minimap.hpp \ - render/Render_opengl.hpp \ - render/Render_svg.hpp \ - render/render_stats.hpp \ + render/Palette.hpp \ + render/Render.hpp \ + render/Geometry.hpp \ + render/Ruler.hpp \ + render/Hook_event.hpp \ + render/Minimap.hpp \ + render/Render_opengl.hpp \ + render/Render_svg.hpp \ + render/render_stats.hpp \ render/render_stats_opengl.hpp \ - render/render_stats_svg.hpp \ -# render/Render_alternate.hpp \ -# render/vbo.hpp \ + render/render_stats_svg.hpp \ +# render/Render_alternate.hpp \ +# render/vbo.hpp \ # Parser headers - parser/Parser.hpp \ - parser/ParserFactory.hpp \ - parser/ParsingThread.hpp \ - parser/PajeDefinition.hpp \ - parser/PajeFileManager.hpp \ + parser/Parser.hpp \ + parser/ParserFactory.hpp \ + parser/ParsingThread.hpp \ + parser/PajeDefinition.hpp \ + parser/PajeFileManager.hpp \ parser/ParserDefinitionPaje.hpp \ - parser/ParserEventPaje.hpp \ - parser/ParserPaje.hpp \ -# parser/ParserVite.hpp \ + parser/ParserEventPaje.hpp \ + parser/ParserPaje.hpp \ +# parser/ParserVite.hpp \ # Data structure headers - trace/Container.hpp \ - trace/ContainerType.hpp \ - trace/DrawTrace.hpp \ - trace/DrawTree.hpp \ - trace/Entity.hpp \ - trace/EntityType.hpp \ - trace/EntityValue.hpp \ - trace/Event.hpp \ - trace/EventType.hpp \ - trace/State.hpp \ - trace/StateChange.hpp \ - trace/StateType.hpp \ - trace/Link.hpp \ - trace/LinkType.hpp \ - trace/Variable.hpp \ - trace/VariableType.hpp \ - trace/Trace.hpp \ - trace/values/Color.hpp \ - trace/values/Date.hpp \ - trace/values/Double.hpp \ - trace/values/Hex.hpp \ - trace/values/Integer.hpp \ - trace/values/Name.hpp \ - trace/values/String.hpp \ - trace/values/Value.hpp \ - trace/values/Values.hpp \ + trace/Container.hpp \ + trace/ContainerType.hpp \ + trace/DrawTrace.hpp \ + trace/DrawTree.hpp \ + trace/Entity.hpp \ + trace/EntityType.hpp \ + trace/EntityValue.hpp \ + trace/Event.hpp \ + trace/EventType.hpp \ + trace/State.hpp \ + trace/StateChange.hpp \ + trace/StateType.hpp \ + trace/Link.hpp \ + trace/LinkType.hpp \ + trace/Variable.hpp \ + trace/VariableType.hpp \ + trace/Trace.hpp \ + trace/values/Color.hpp \ + trace/values/Date.hpp \ + trace/values/Double.hpp \ + trace/values/Hex.hpp \ + trace/values/Integer.hpp \ + trace/values/Name.hpp \ + trace/values/String.hpp \ + trace/values/Value.hpp \ + trace/values/Values.hpp \ trace/tree/BinaryTree.hpp \ - trace/tree/Node.hpp \ - trace/tree/Interval.hpp \ + trace/tree/Node.hpp \ + trace/tree/Interval.hpp \ # Statistics headers statistics/Stats_window.hpp \ - statistics/Statistic.hpp \ - statistics/DrawStats.hpp \ + statistics/Statistic.hpp \ + statistics/DrawStats.hpp \ statistics/DrawVDiagram.hpp \ statistics/DrawHDiagram.hpp \ - statistics/DrawCounter.hpp \ + statistics/DrawCounter.hpp \ # Plugin header plugin/Command_window.hpp \ - plugin/Plugin_window.hpp \ - plugin/Plugin.hpp \ -# External header - qtcolorpicker/src/qtcolorpicker.h + plugin/Plugin_window.hpp \ + plugin/Plugin.hpp \ +# QtColorPicker + qtcolorpicker.h +FORMS += interface/info_window.ui \ + interface/main_window.ui \ + interface/option_export_window.ui \ + interface/settings.ui \ + interface/stats_viewer.ui \ + interface/global_cmd.ui \ + interface/list_of_counter_to_export.ui -FORMS += interface/info_window.ui interface/main_window.ui interface/option_export_window.ui interface/settings.ui interface/stats_viewer.ui interface/global_cmd.ui list_of_counter_to_export.ui - -SOURCES += common/Message.cpp \ - common/Errors.cpp \ - common/Tools.cpp \ - common/Info.cpp \ - common/Session.cpp \ +SOURCES += common/Message.cpp \ + common/Errors.cpp \ + common/Tools.cpp \ + common/Info.cpp \ + common/Session.cpp \ # Data structure code files - trace/values/Color.cpp \ - trace/values/Date.cpp \ - trace/values/Double.cpp \ - trace/values/Hex.cpp \ - trace/values/Integer.cpp \ - trace/values/Name.cpp \ - trace/values/String.cpp \ - trace/EntityType.cpp \ - trace/ContainerType.cpp \ - trace/EventType.cpp \ - trace/StateType.cpp \ - trace/LinkType.cpp \ - trace/VariableType.cpp \ - trace/EntityValue.cpp \ - trace/Entity.cpp \ - trace/Event.cpp \ - trace/State.cpp \ - trace/StateChange.cpp \ - trace/Link.cpp \ - trace/Variable.cpp \ - trace/Container.cpp \ - trace/tree/Interval.cpp \ - trace/Trace.cpp \ + trace/values/Color.cpp \ + trace/values/Date.cpp \ + trace/values/Double.cpp \ + trace/values/Hex.cpp \ + trace/values/Integer.cpp \ + trace/values/Name.cpp \ + trace/values/String.cpp \ + trace/EntityType.cpp \ + trace/ContainerType.cpp \ + trace/EventType.cpp \ + trace/StateType.cpp \ + trace/LinkType.cpp \ + trace/VariableType.cpp \ + trace/EntityValue.cpp \ + trace/Entity.cpp \ + trace/Event.cpp \ + trace/State.cpp \ + trace/StateChange.cpp \ + trace/Link.cpp \ + trace/Variable.cpp \ + trace/Container.cpp \ + trace/tree/Interval.cpp \ + trace/Trace.cpp \ # Parser code files - parser/Parser.cpp \ - parser/ParserFactory.cpp \ - parser/ParsingThread.cpp \ - parser/PajeDefinition.cpp \ - parser/PajeFileManager.cpp \ + parser/Parser.cpp \ + parser/ParserFactory.cpp \ + parser/ParsingThread.cpp \ + parser/PajeDefinition.cpp \ + parser/PajeFileManager.cpp \ parser/ParserDefinitionPaje.cpp \ - parser/ParserEventPaje.cpp \ - parser/ParserPaje.cpp \ -# parser/ParserVite.cpp \ + parser/ParserEventPaje.cpp \ + parser/ParserPaje.cpp \ +# parser/ParserVite.cpp \ # Render code files - render/Palette.cpp \ - render/Geometry.cpp \ - render/Ruler.cpp \ - render/Hook_event.cpp \ - render/Render.hpp \ - render/Minimap.cpp \ - render/Render_opengl.cpp \ - render/Render_svg.cpp \ + render/Palette.cpp \ + render/Geometry.cpp \ + render/Ruler.cpp \ + render/Hook_event.cpp \ + render/Render.hpp \ + render/Minimap.cpp \ + render/Render_opengl.cpp \ + render/Render_svg.cpp \ render/render_stats_opengl.cpp \ - render/render_stats_svg.cpp \ -# render/Render_alternate.cpp \ -# render/vbo.cpp \ + render/render_stats_svg.cpp \ +# render/Render_alternate.cpp \ +# render/vbo.cpp \ # Statistics code files - statistics/Stats_window.cpp \ - statistics/Statistic.cpp \ + statistics/Stats_window.cpp \ + statistics/Statistic.cpp \ # Interface code files -# interface/help.cpp \ - interface/Settings_window.cpp \ + interface/Settings_window.cpp \ interface/interface_graphic.cpp \ # Core code file core/Core.cpp \ # Plugin code file plugin/Command_window.cpp \ - plugin/Plugin_window.cpp \ - plugin/Plugin.cpp \ -# External code file - qtcolorpicker/src/qtcolorpicker.cpp \ + plugin/Plugin_window.cpp \ + plugin/Plugin.cpp \ +# QtColorPicker + qtcolorpicker.cpp \ # Main code file main.cpp - - RESOURCES += interface/vite.qrc # Windows icon -- 2.22.0