Mentions légales du service

Skip to content
Snippets Groups Projects
Commit c81031c7 authored by Johnny Jazeix's avatar Johnny Jazeix
Browse files

tag of 1.1 is r1005 and not r999

parent d5c6b9a5
No related branches found
No related tags found
No related merge requests found
...@@ -49,17 +49,38 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ...@@ -49,17 +49,38 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
makefile="Makefile" makefile="Makefile"
with_otf=0 with_otf=0
config_specified=0
# where will we concatenate options like macros, libs... # where will we concatenate options like macros, libs...
compilation_src_pro="src.pro" compilation_src_pro="src.pro"
# For qmake # For qmake
config="\"CONFIG+="
defines="\"DEFINES+=" defines="\"DEFINES+="
libs="\"LIBS+=" libs="\"LIBS+="
includes="\"INCLUDES+=" includes="\"INCLUDES+="
sources="\"SOURCES+=" sources="\"SOURCES+="
headers="\"HEADERS+=" headers="\"HEADERS+="
echo ""
echo "-------------------------------"
echo "-------------------------------"
echo ""
echo " Visual Trace Explorer"
echo " - configuration -"
echo ""
echo ""
echo " type './configure -h' for help "
echo ""
echo ""
echo " Default mode is:"
echo " * RELEASE mode"
echo ""
echo "-------------------------------"
echo "-------------------------------"
echo ""
echo ""
usage() usage()
{ {
echo "ViTE configuration shell-script" echo "ViTE configuration shell-script"
...@@ -67,11 +88,20 @@ usage() ...@@ -67,11 +88,20 @@ usage()
echo " ./configure [ options ]" echo " ./configure [ options ]"
echo echo
echo "Options:" echo "Options:"
echo " --help" echo " -h, --help"
echo " -h print this page" echo " print this page"
echo echo ""
echo " --enable_spinning_logo makes the rabbit to turn when no trace is loaded" echo " --release"
echo " --enable_otf enables the otf support. The otf release used by default is in the src/general directory" echo " compiles in release mode (by default)"
echo ""
echo " --debug"
echo " compiles in debug mode"
echo ""
echo " --enable_spinning_logo"
echo " makes the rabbit to turn when no trace is loaded"
echo ""
echo " --enable_otf"
echo " enables the otf support. The otf release used by default is in the src/general directory"
## Will be added later ## Will be added later
# echo " --otf_include_dir=<path> set the otf directory path" # echo " --otf_include_dir=<path> set the otf directory path"
# echo " --otf_library_dir=<path> set the otf library path (<path>/libotf.a)" # echo " --otf_library_dir=<path> set the otf library path (<path>/libotf.a)"
...@@ -98,22 +128,34 @@ while [ 0 -lt $# ]; do ...@@ -98,22 +128,34 @@ while [ 0 -lt $# ]; do
--enable_spinning_logo) # good openGL spinning rabbit :) --enable_spinning_logo) # good openGL spinning rabbit :)
defines="$defines SPINNING_LOGO" defines="$defines SPINNING_LOGO"
;; ;;
--release)
config_specified=1;
config="$config release"
;;
--debug)
config_specified=1;
config="$config debug"
;;
*) *)
echo "invalid option : $OPT"; echo "invalid option : $OPT";
exit 0; exit 0;
esac esac
done done
#end the qmake options #end the qmake options
if [ $config_specified == 1 ]; then
config="$config\"";
else
config="$config release\"";
fi
defines="$defines\""; defines="$defines\"";
libs="$libs\""; libs="$libs\"";
includes="$includes\""; includes="$includes\"";
sources="$sources\""; sources="$sources\"";
headers="$headers\""; headers="$headers\"";
compilation_src_pro="$defines $libs $includes $sources $headers"; compilation_src_pro="$defines $config $libs $includes $sources $headers";
# find a make command # find a make command
if [ -z "$MAKE" ]; then if [ -z "$MAKE" ]; then
......
...@@ -71,12 +71,12 @@ ...@@ -71,12 +71,12 @@
* \def VITE_VERSION * \def VITE_VERSION
* \brief the ViTE version (string) * \brief the ViTE version (string)
*/ */
#define VITE_VERSION "1.1-alpha1" #define VITE_VERSION "1.1"
/*! /*!
* \def VITE_DATE * \def VITE_DATE
* \brief the ViTE release date (string) * \brief the ViTE release date (string)
*/ */
#define VITE_DATE "December 2009" #define VITE_DATE "January 2010"
/*! /*!
* \def VITE_WEBSITE * \def VITE_WEBSITE
* \brief the ViTE website (string) * \brief the ViTE website (string)
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#RESOURCES= vite.qrc #RESOURCES= vite.qrc
OBJECTS_DIR=../bin OBJECTS_DIR=../bin
DESTDIR=../bin DESTDIR=../bin
CONFIG+=uitools debug CONFIG+=uitools
QT+=opengl QT+=opengl
TEMPLATE = app TEMPLATE = app
TARGET = vite TARGET = vite
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment