Release-1.8.3.1-20130512

Author: Dimitri van Heesch

INSTALL

@@ -1,7 +1,7 @@
-DOXYGEN Version 1.8.3.1-20130402
+DOXYGEN Version 1.8.3.1-20130512
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (02 April 2013)
+Dimitri van Heesch (12 May 2013)

Makefile.in

@@ -82,7 +82,7 @@ pdf: docs
 DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects \
              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
              Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
-             VERSION packages winbuild
+             VERSION packages winbuild jquery
 
 archive: clean
 	tar zcvf dx`date +%y%m%d`.tgz $(DISTFILES)

README

@@ -1,4 +1,4 @@
-DOXYGEN Version 1.8.3.1_20130402
+DOXYGEN Version 1.8.3.1_20130512
 
 Please read INSTALL for compilation instructions.
 
@@ -26,4 +26,4 @@ forum.
 
 Enjoy,
 
-Dimitri van Heesch ([email protected]) (02 April 2013)
+Dimitri van Heesch ([email protected]) (12 May 2013)

addon/doxywizard/expert.cpp

@@ -270,11 +270,18 @@ QWidget *Expert::createTopicWidget(QDomElement &elem)
   child = elem.firstChildElement();
   while (!child.isNull())
   {
+    QString setting = child.attribute(SA("setting"));
     QString dependsOn = child.attribute(SA("depends"));
     QString id        = child.attribute(SA("id"));
-    if (!dependsOn.isEmpty())
+    if (!dependsOn.isEmpty() && 
+        (setting.isEmpty() || IS_SUPPORTED(setting.toAscii())))
     {
        Input *parentOption = m_options[dependsOn];
+       if (parentOption==0)
+       {
+         printf("%s has depends=%s that is not valid\n",
+             qPrintable(id),qPrintable(dependsOn));
+       }
        Input *thisOption   = m_options[id];
        Q_ASSERT(parentOption);
        Q_ASSERT(thisOption);

addon/doxywizard/inputbool.cpp

@@ -43,6 +43,8 @@ void InputBool::setEnabled(bool b)
 { 
   m_enabled = b;
   m_cb->setEnabled(b); 
+  m_lab->setEnabled(b); 
+  updateDefault();
   updateDependencies();
 }
 
@@ -69,7 +71,7 @@ void InputBool::setValue( bool s )
 
 void InputBool::updateDefault()
 {
-  if (m_state==m_default)
+  if (m_state==m_default || !m_lab->isEnabled())
   {
     m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
   }

addon/doxywizard/inputint.cpp

@@ -17,14 +17,23 @@
 
 #include <QtGui>
 
+class NoWheelSpinBox : public QSpinBox
+{
+  protected:
+    void wheelEvent(QWheelEvent *e)
+    {
+      e->ignore();
+    }
+};
+
 InputInt::InputInt( QGridLayout *layout,int &row,
                     const QString & id, 
                     int defVal, int minVal,int maxVal,
                     const QString & docs )
   : m_default(defVal), m_minVal(minVal), m_maxVal(maxVal), m_docs(docs), m_id(id)
 {
   m_lab = new HelpLabel(id);
-  m_sp  = new QSpinBox;
+  m_sp  = new NoWheelSpinBox;
   m_sp->setMinimum(minVal);
   m_sp->setMaximum(maxVal);
   m_sp->setSingleStep(1);
@@ -56,7 +65,14 @@ void InputInt::setValue(int val)
     m_val = val;
     m_sp->setValue(val);
     m_value = m_val;
-    if (m_val==m_default)
+    updateDefault();
+  }
+}
+
+void InputInt::updateDefault()
+{
+  {
+    if (m_val==m_default || !m_lab->isEnabled())
     {
       m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
     }
@@ -72,6 +88,7 @@ void InputInt::setEnabled(bool state)
 {
   m_lab->setEnabled(state);
   m_sp->setEnabled(state);
+  updateDefault();
 }
 
 QVariant &InputInt::value() 

addon/doxywizard/inputint.h

@@ -56,6 +56,7 @@ class InputInt : public QObject, public Input
     void showHelp(Input *);
 
   private:
+    void updateDefault();
     QLabel   *m_lab;
     QSpinBox *m_sp;
     int       m_val;

addon/doxywizard/inputstring.cpp

@@ -19,6 +19,16 @@
 
 #include <QtGui>
 
+class NoWheelComboBox : public QComboBox
+{
+  protected:
+    void wheelEvent(QWheelEvent *e)
+    {
+      e->ignore();
+    }
+};
+
+
 InputString::InputString( QGridLayout *layout,int &row,
                           const QString & id, const QString &s, 
                           StringMode m, const QString &docs,
@@ -30,7 +40,7 @@ InputString::InputString( QGridLayout *layout,int &row,
   if (m==StringFixed)
   {
     layout->addWidget( m_lab, row, 0 );
-    m_com = new QComboBox; 
+    m_com = new NoWheelComboBox; 
     layout->addWidget( m_com, row, 1, 1, 3, Qt::AlignLeft );
     m_le=0;
     m_br=0;
@@ -95,7 +105,13 @@ void InputString::setValue(const QString &s)
   {
     m_str = s;
     m_value = m_str;
-    if (m_str==m_default)
+    updateDefault();
+  }
+}
+void InputString::updateDefault()
+{
+  {
+    if (m_str==m_default || !m_lab->isEnabled())
     {
       m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
     }
@@ -114,6 +130,7 @@ void InputString::setEnabled(bool state)
   if (m_le)  m_le->setEnabled(state);
   if (m_br)  m_br->setEnabled(state);
   if (m_com) m_com->setEnabled(state);
+  updateDefault();
 }
 
 void InputString::browse()

addon/doxywizard/inputstring.h

@@ -72,6 +72,7 @@ class InputString : public QObject, public Input
     void help();
 
   private:
+    void updateDefault();
     QLabel       *m_lab;
     QLineEdit    *m_le;
     QToolBar     *m_br;

addon/doxywizard/inputstrlist.cpp

@@ -141,6 +141,7 @@ void InputStrList::setEnabled(bool state)
   m_lb->setEnabled(state);
   if (m_brFile) m_brFile->setEnabled(state);
   if (m_brDir)  m_brDir->setEnabled(state);
+  updateDefault();
 }
 
 void InputStrList::browseFiles()
@@ -222,7 +223,7 @@ void InputStrList::update()
 
 void InputStrList::updateDefault()
 {
-  if (m_strList==m_default)
+  if (m_strList==m_default || !m_lab->isEnabled())
   {
     m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
   }

configure

@@ -20,7 +20,7 @@ doxygen_version_minor=8
 doxygen_version_revision=3.1
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=20130402
+doxygen_version_mmn=20130512
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 
@@ -42,6 +42,7 @@ f_search=NO
 f_langs=nl,sv,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,mk,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa,sc,vi,tr,eo,am
 f_sqlite3=NO
 f_libclang=NO
+f_libclangstatic=NO
 
 while test -n "$1";  do
   case $1 in
@@ -105,6 +106,10 @@ while test -n "$1";  do
     --with-libclang | -with-libclang)
        f_libclang=YES
        ;;
+    --with-libclang-static | -with-libclang-static)
+       f_libclang=YES
+       f_libclangstatic=YES
+       ;;
     -h | -help | --help)
        f_help=y
        ;;
@@ -122,7 +127,8 @@ if test "$f_help" = y; then
 Usage: $0 [--help] [--shared] [--static] [--release] [--debug] 
           [--perl name] [--flex name] [--bison name] [--make name] 
           [--dot name] [--platform target] [--prefix dir] [--docdir dir] 
-          [--install name] [--english-only] [--enable-langs list] [--with-sqlite3]
+          [--install name] [--english-only] [--enable-langs list] 
+          [--with-sqlite3] [--with-libclang]
           [--with-doxywizard] [--with-doxysearch] [--with-doxyapp]
 
 Options: 
@@ -156,7 +162,7 @@ Options:
   --enable-langs list 	Include support for output languages listed in list.
   			[default: $f_langs]
   --with-sqlite3        Add support for sqlite3 output [experimental]
-  --with-libclang       Add support for libclang parsing [experimental]
+  --with-libclang       Add support for libclang parsing
   --with-doxywizard     Build the GUI frontend for doxygen. This
                         requires Qt version 4.
   --with-doxysearch     Build external search tools (doxysearch and doxyindexer)
@@ -450,7 +456,11 @@ if test "$f_libclang" = YES; then
   printf "  Checking for libclang ... "
   libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include"
   libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib"
-  libclang_lib_name="libclang.so libclang.dylib libclang.a"
+  if test "$f_libclangstatic" = NO; then
+    libclang_lib_name="libclang.so libclang.dylib libclang.a"
+  else
+    libclang_lib_name="libclang.a"
+  fi
   libclang_hdr=NO
   libclang_lib=NO
   libclang_link=
@@ -465,7 +475,11 @@ if test "$f_libclang" = YES; then
       for j in $libclang_lib_name; do
         if test -f "$i/$j"; then
           libclang_lib="$i/$j"
-          libclang_link="-L $i -lclang"
+          if test "$f_libclangstatic" = NO; then
+            libclang_link="-L $i -lclang"
+          else
+            libclang_link="$i/libLLVMBitReader.a $i/libLLVMMC.a $i/libLLVMMCParser.a $i/libLLVMSupport.a $i/libclang.a $i/libclangAST.a $i/libclangAnalysis.a $i/libclangBasic.a $i/libclangDriver.a $i/libclangEdit.a $i/libclangFrontend.a $i/libclangLex.a $i/libclangParse.a $i/libclangRewriteCore.a $i/libclangSema.a $i/libclangSerialization.a $i/libclangStaticAnalyzerCore.a"
+          fi
           break
         fi
       done

doc/Doxyfile

@@ -39,7 +39,7 @@ INPUT             = index.doc install.doc starting.doc docblocks.doc markdown.do
                     external.doc faq.doc trouble.doc features.doc \
 		    doxygen_usage.doc doxywizard_usage.doc \
 		    config.doc commands.doc htmlcmds.doc xmlcmds.doc language.doc \
-                    perlmod.doc perlmod_tree.doc arch.doc 
+                    perlmod.doc perlmod_tree.doc arch.doc changelog.doc
 FILE_PATTERNS     = *.cpp *.h *.doc
 EXAMPLE_PATH      = ../examples
 RECURSIVE         = NO