jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct an Utf8 bug. 

When using easyChams you need to set LANG to utf8
This commit is contained in:
Damien Dupuis 2010-02-25 15:31:45 +00:00
parent d3ee85fa2e
commit e9e60fea07
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/easyChams/CompilationWidget.cpp
View File

@ -229,14 +229,14 @@ void CompilationWidget::updateConfig(QStringList list) {
void CompilationWidget::updateError() { void CompilationWidget::updateError() {
QByteArray data = _myProcess->readAllStandardError(); QByteArray data = _myProcess->readAllStandardError();
_console->insertPlainText(QString(data)); _console->insertPlainText(QString::fromUtf8(data.constData()));
int end = _console->verticalScrollBar()->maximum(); int end = _console->verticalScrollBar()->maximum();
_console->verticalScrollBar()->setValue(end); _console->verticalScrollBar()->setValue(end);
} }
void CompilationWidget::updateText() { void CompilationWidget::updateText() {
QByteArray data = _myProcess->readAllStandardOutput(); QByteArray data = _myProcess->readAllStandardOutput();
QString str(data); QString str = QString::fromUtf8(data.constData());
QRegExp rx = QRegExp ( "([0-9]+)%" ); QRegExp rx = QRegExp ( "([0-9]+)%" );
if ( str.contains(rx) ) { if ( str.contains(rx) ) {
bool ok; bool ok;

5
bootstrap/easyChams/script/chams.sh
View File

@ -81,7 +81,8 @@ compile() {
echo " -> Please update manually" echo " -> Please update manually"
exit 1 exit 1
fi fi
svn update --accept postpone # par defaut on prendra la decision en cas de conflits plus tard (au cas ou le status n'est pas suffisant) #svn update --accept postpone # par defaut on prendra la decision en cas de conflits plus tard (au cas ou le status n'est pas suffisant)
svn update # par defaut on prendra la decision en cas de conflits plus tard (au cas ou le status n'est pas suffisant)
fi fi
if [ ! -d "$BUILD/$TOOL" ] if [ ! -d "$BUILD/$TOOL" ]
then then
@ -102,7 +103,7 @@ compile() {
echo "#### Now compiling $TOOL ####" echo "#### Now compiling $TOOL ####"
echo "" echo ""
cmake -D "CMAKE_BUILD_TYPE:STRING=$MODE" -D "BUILD_DOC:STRING=$DOC" -D "BUILD_SHARED_LIBS:STRING=$SHARED" $SOURCE/$TOOL cmake -D "CMAKE_BUILD_TYPE:STRING=$MODE" -D "BUILD_DOC:STRING=$DOC" -D "BUILD_SHARED_LIBS:STRING=$SHARED" $SOURCE/$TOOL
make "DESTDIR=$INSTALL" -j2 install make "DESTDIR=$INSTALL" -j8 install
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
exit 1 exit 1