onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-19 17:57:22 +01:00
Code Issues Releases Wiki Activity

fixed bug 2785671; added verbose error messages to autogen.sh for when autoconf and libtool are missing

Browse Source
This commit is contained in:
Vadim Kurland 2009-05-02 19:24:25 +00:00
parent c38c2a035a
commit 56db618e57
5 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
autogen.sh
View File

@ -7,24 +7,34 @@ if test ! -x "$MAKE" ; then MAKE=`which make` ; fi
HAVE_GNU_MAKE=`$MAKE --version|grep -c "Free Software Foundation"`
if test "$HAVE_GNU_MAKE" != "1"; then
echo Could not find GNU make on this system, can not proceed with build.
echo "Could not find GNU make on this system, can not proceed with build."
exit 1
else
echo Found GNU Make at $MAKE ... good.
echo "Found GNU Make at $MAKE ... good."
fi
echo This script runs configure ...
echo You did remember necessary arguments for configure, right?
if test ! -x "`which aclocal`"
then echo you need autoconf to generate the configure script
then
echo "You need aclocal and autoconf to generate configure and Makefile."
echo "Please install autoconf package."
exit 1
fi
if test ! -x "`which libtoolize`"
then
if test ! -x "`which glibtoolize`"
then
echo "You need libtoolize to generate autoconf and libtool scripts."
echo "Please install libtool package."
exit 1
fi
fi
echo "This script runs configure ..."
ACLOCALARG=""
test -d /sw/share/ && ACLOCALARG=" -I /sw/share/aclocal"
which libtoolize >/dev/null 2>&1 && libtoolize --force --copy
which glibtoolize >/dev/null 2>&1 && glibtoolize --force --copy
which acinclude >/dev/null 2>&1 && acinclude

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 863
#define BUILD_NUM 869

15
doc/ChangeLog
View File

@ -1,8 +1,17 @@
2009-05-02 vadim <vadim@vk.crocodile.org>
* DiscoveryDruid.cpp (DiscoveryDruid::DiscoveryDruid): fixed bug
#2785671 "Menu 'Import Policy' opens wizard with wrong option
checked". The "discovery druid' dialog would open on the first
page (where user makes a choice which discovery method to use)
even when called via main menu "File/Import Policy" and radio
button for the SNMP discovery was activated.
2009-04-30 Vadim Kurland <vadim@vk.crocodile.org>
* ObjectManipulator.cpp (ObjectManipulator::addTreePage):
references bug #2783780: trying QTreeWidget::sortItems() instead
of sortByColumn
* ObjectManipulator.cpp (ObjectManipulator::addTreePage): fixed
bug #2783780: using QTreeWidget::sortItems() instead of
sortByColumn to sort objects in the tree.
2009-04-29 Vadim Kurland <vadim@vk.crocodile.org>

6
src/gui/DiscoveryDruid.cpp
View File

@ -160,6 +160,9 @@ DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
importPlatformChanged(m_dialog->import_platform->currentIndex());
showPage(0);
setNextEnabled(0, true);
#ifdef HAVE_ANTLR_RUNTIME
if (start_with_import)
{
@ -168,12 +171,11 @@ DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
setAppropriate( 0, false );
// show the first page of the "import policy" track of the wizard
showPage( 2 );
setNextEnabled(2, true);
cancelButton->show();
}
#endif
showPage(0);
setNextEnabled(0, true);
prg_timer->start(100);
}

3
src/gui/ObjectManipulator.cpp
View File

@ -839,7 +839,6 @@ void ObjectManipulator::addTreePage( FWObject *lib)
itm1->setIcon( 0, pm);
}
//itm1->setProperty("id", lib->getId().c_str() );
itm1->setProperty("type", lib->getTypeName().c_str() );
itm1->setFWObject( lib );
allItems[lib] = itm1;
@ -848,7 +847,7 @@ void ObjectManipulator::addTreePage( FWObject *lib)
insertSubtree( itm1, (*m) );
objTreeView->updateTreeItems();
// objTreeView->sortByColumn(0, Qt::AscendingOrder);
// apparently sortByColumn does not work in QT 4.5, use sortItems
objTreeView->sortItems(0, Qt::AscendingOrder);
}