Commit 2b7214ab authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Release-1.5.7.1

parent 7b38eb9f

INSTALL

+2 −2
Original line number Diff line number Diff line 
DOXYGEN Version 1.5.7

DOXYGEN Version 1.5.7.1



Please read the installation section of the manual 

(http://www.doxygen.org/install.html) for instructions.



--------

Dimitri van Heesch (28 September 2008)
 
Dimitri van Heesch (04 October 2008)

Makefile.in

+12 −10
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#	cd qtools ; $(MAKE)

#	cd src ; $(MAKE)



DESTDIR = 



clean: FORCE

	cd examples ; $(MAKE) clean

	cd doc ; $(MAKE) clean
@@ -53,25 +55,25 @@ DATE=$(shell date "+%B %Y") 
MAN1DIR = man/man1



install: doxywizard_install 

	$(INSTTOOL) -d $(INSTALL)/bin

	$(INSTTOOL) -m 755 bin/doxygen    $(INSTALL)/bin

	$(INSTTOOL) -m 755 bin/doxytag    $(INSTALL)/bin

	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)

	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin

	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin

	$(INSTTOOL) -m 755 bin/doxytag    $(DESTDIR)/$(INSTALL)/bin

	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)

	cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1 

	$(INSTTOOL) -m 644 doxygen.1 $(INSTALL)/$(MAN1DIR)/doxygen.1

	$(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1

	rm doxygen.1

	cat doc/doxytag.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1

	$(INSTTOOL) -m 644 doxytag.1 $(INSTALL)/$(MAN1DIR)/doxytag.1

	$(INSTTOOL) -m 644 doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1

	rm doxytag.1



install_docs: 

	$(INSTTOOL) -d $(DOCDIR)

	$(INSTTOOL) -d $(DESTDIR)/$(DOCDIR)

	$(MAKE) -C examples

	$(MAKE) -C doc 

	$(MAKE) -C latex 

	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DOCDIR)

	cp -r examples $(DOCDIR)

	cp -r html $(DOCDIR)

	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)

	cp -r examples $(DESTDIR)/$(DOCDIR)

	cp -r html $(DESTDIR)/$(DOCDIR)



docs: FORCE

	cd examples ; $(MAKE)

README

+2 −2
Original line number Diff line number Diff line 
DOXYGEN Version 1.5.7

DOXYGEN Version 1.5.7.1



Please read INSTALL for compilation instructions.
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. 


Enjoy,



Dimitri van Heesch (dimitri@stack.nl) (28 September 2008)
 
Dimitri van Heesch (dimitri@stack.nl) (04 October 2008)

addon/doxywizard/doxywizard.cpp

+18 −12
Original line number Diff line number Diff line
@@ -49,12 +49,18 @@ QCString getResourcePath() 


void setDotPath()

{

  Config_getString("DOT_PATH")=getResourcePath();

  // TODO: enable this if we ship dot with doxygen again...

//  Config_getString("DOT_PATH")=getResourcePath();

}



void setMscgenPath()

bool setMscgenPath()

{

  if (Config_getString("MSCGEN_PATH")!=getResourcePath())

  {

    Config_getString("MSCGEN_PATH")=getResourcePath();

    return TRUE;

  }

  return FALSE;

}



#endif
@@ -496,11 +502,11 @@ Step4::Step4(QWidget *parent) : QWidget(parent,"Step4") 
    m_dotOptions->setEnabled(FALSE);

  gbox->addWidget(w,4,0);



#if defined(Q_OS_MACX) // we bundle dot with the mac package

  m_diagramMode->setButton(2);

#else

//#if defined(Q_OS_MACX) // we bundle dot with the mac package

//  m_diagramMode->setButton(2);

//#else

  m_diagramMode->setButton(1);

#endif

//#endif

  layout->addWidget(m_diagramMode);

  layout->addStretch(1);
@@ -1106,11 +1112,11 @@ void MainWidget::loadConfigFromFile(const QString &fn) 
    m_workingDir->setText(QFileInfo(fn).dirPath(TRUE));

    m_configFileName = fn;

#if defined(Q_OS_MACX)

    if (Config_getString("DOT_PATH").isEmpty())

    {

      setDotPath();

      setConfigSaved(FALSE);

    }

    //if (Config_getString("DOT_PATH").isEmpty())

    //{

    //  setDotPath();

    //  setConfigSaved(FALSE);

    //}

    if (Config_getString("MSCGEN_PATH").isEmpty())

    {

      setMscgenPath();

configure

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


doxygen_version_major=1

doxygen_version_minor=5

doxygen_version_revision=7

doxygen_version_revision=7.1



#NOTE: Setting version_mmn to "NO" will omit mmn info from the package.

doxygen_version_mmn=NO
@@ -46,7 +46,7 @@ while test -n "$1"; do 
       shift; f_prefix=$1

       ;;

    --docdir | -docdir)

       shift; f_docdir=$1/doxygen

       shift; f_docdir=$1

       ;;

    --shared | -shared)

       f_shared=YES
@@ -136,8 +136,8 @@ Options: 
  --prefix dir          Installation prefix directory (doxygen will be

                        put in PREFIX/bin/doxygen)

                        [default: $f_prefix]

  --docdir dir          Documentation is installed in DOCDIR/doxygen/

                        [default: PREFIX/share/doc/packages]

  --docdir dir          Documentation is installed in DOCDIR/

                        [default: PREFIX/share/doc/packages/doxygen]

  --install name        Use \`name' as the name of the GNU install tool

                        [default: autodetect]

  --english-only        Include support for English only.
@@ -224,7 +224,7 @@ if test -z "$f_platform"; then 
    UNIX_SV:4.2*)

      f_platform=unixware-g++

      ;;

    Cygwin:*|CYGWIN:*)

    Cygwin:*|CYGWIN*)

      f_platform=win32-g++

      ;;

    *MiNT:*)