Attention une mise à jour du serveur va être effectuée le vendredi 16 avril entre 12h et 12h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit b2fdd68f authored by Laurent Belcour's avatar Laurent Belcour

Correction for the ALPHA generation.

parent 9d0e6de3
TARGET = quadprog++
TEMPLATE = lib
CONFIG *= static \
qt \
plugin \
eigen
......
TARGET = quadprog++
TEMPLATE = lib
CONFIG *= static \
qt \
plugin \
eigen
......
......@@ -15,9 +15,10 @@ elif [ "$ZSH_VERSION" ]; then
sources=$(dirname "$0:A")
fi
path=${sources}/sources/build
scripts=${sources}/sources/scripts
export ALTA=$sources
export ALTA_LIB=$path
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$path
export PATH=$PATH:$path
export PATH=$PATH:$path:$scripts
export PYTHONPATH=$PYTHONPATH:$path
......@@ -7,7 +7,6 @@ cd ../alta-alpha
# Remove unecessary parts (data, retro plugins, ...)
rm -rf data
rm -rf papers
rm -rf external/quadprog++-v2
rm -rf sources/tests
rm -rf sources/matlab
rm -rf sources/xml
......@@ -23,7 +22,7 @@ rm -rf sources/softs/data2diff
rm -rf sources/scripts/generate-alpha.sh
# Creating the C++ LICENSE header
echo "/*\n$(cat LICENSE.txt | while read LINE; do echo " * $LINE"; done;)\n */\n\n" > LICENSE.C
echo "/*$(cat LICENSE.txt | while read LINE; do echo " * $LINE"; done;) */" > LICENSE.C
# Add headers to all .cpp .h files
find ./sources/ -regex ".*\.\(h\|cpp\)$" | while read FILE; do
......
......@@ -15,14 +15,7 @@
int main(int argc, char** argv)
{
<<<<<<< local
QApplication app(argc, argv, false);
arguments args(argc, argv);
plugins_manager manager(args) ;
=======
arguments args(argc, argv) ;
>>>>>>> other
if(args.is_defined("help")) {
std::cout << "<<HELP>> data2diff --input data.file --output gnuplot.file --data loader.so --param RUSIN_TH_PH_TD_PD --partial 0" << std::endl ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment