From 891ed9924813dc4d2cd7e32d0886fd4e57c49e5a Mon Sep 17 00:00:00 2001 From: sebastien Date: Wed, 9 Jul 2008 21:07:02 +0000 Subject: [PATCH] v4 packaging: documentation-related changes git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1949 ac1d8469-bf42-47a9-8791-bf33cf982152 --- debian/control | 2 +- debian/dynare.docs | 6 ++++++ debian/rules | 6 +++++- windows/dynare.nsi | 9 +++++---- 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 debian/dynare.docs diff --git a/debian/control b/debian/control index d7e0663c7..dab38345b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: dynare Maintainer: Sébastien Villemot Section: math Priority: optional -Build-Depends: debhelper (>= 6), octave3.0-headers, g++-4.1, flex, bison +Build-Depends: debhelper (>= 6), octave3.0-headers, g++-4.1, flex, bison, texlive, xsltproc, dblatex, latex-beamer Standards-Version: 3.8.0 Homepage: http://www.dynare.org diff --git a/debian/dynare.docs b/debian/dynare.docs new file mode 100644 index 000000000..a0f690bd2 --- /dev/null +++ b/debian/dynare.docs @@ -0,0 +1,6 @@ +doc/manual.pdf +doc/manual-html +doc/guide.pdf +doc/macroprocessor/macroprocessor.pdf +doc/bvar-a-la-sims.pdf +doc/userguide/Dynare_UserGuide_WebBeta.pdf diff --git a/debian/rules b/debian/rules index d96fc0de1..ddf4edf2d 100755 --- a/debian/rules +++ b/debian/rules @@ -34,12 +34,16 @@ ifeq ($(shell test -d $(MATLAB75_ROOT) && echo yes), yes) $(MATLAB75_ROOT)/etc/lmdown endif + # Building documentation + make -C doc + touch build-stamp clean: dh_testdir dh_testroot make clean -C preprocessor + make clean -C doc find mex/sources -name *.o | xargs rm -f rm -f mex/octave/*.mex mex/2007a/* mex/2007b/* rm -f matlab/dynare_m matlab/dynare_m.exe @@ -57,7 +61,7 @@ binary-arch: build dh_installdocs -dh_lintian # Do not fail here, since dh_lintian is only present in debhelper >= 6.0.7, and Ubuntu Hardy has 6.0.4 dh_strip - dh_compress + dh_compress -X.pdf dh_fixperms dh_shlibdeps dh_gencontrol diff --git a/windows/dynare.nsi b/windows/dynare.nsi index 7237c22c9..561a243e9 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -1,7 +1,8 @@ # Configuration file for building Dynare Windows Installer # Uses "NullSoft Scriptable Installer System", aka NSIS (see http://nsis.sourceforge.net) # NSIS can be run from both Windows and Linux (see "nsis" package in Debian) -# (However for Dynare it fails under Debian because we use a plugin which cannot be compiled under Debian at this time) + +# NOTE: if you want to build from Debian, you'll need to replace /usr/share/nsis/Plugins/System.dll by the System.dll included in the windows distribution of NSIS (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=319999) # How to build the installer: # - build the preprocessor, the MEX binaries (for Matlab 7.4, 7.5 and for Octave), and the documentation (PDF files + HTML manual) @@ -68,10 +69,10 @@ Section File ..\mex\octave\rcond.m ..\mex\octave\*.mex SetOutPath $INSTDIR\doc - File ..\doc\guide.pdf ..\doc\userguide\Dynare_UserGuide_WebBeta.pdf ..\doc\bvar-a-la-sims.pdf + File ..\doc\manual.pdf ..\doc\guide.pdf ..\doc\userguide\Dynare_UserGuide_WebBeta.pdf ..\doc\bvar-a-la-sims.pdf ..\doc\macroprocessor\macroprocessor.pdf - SetOutPath $INSTDIR\doc\manual - File ..\doc\manual\*.html + SetOutPath $INSTDIR\doc\manual-html + File ..\doc\manual-html\*.html WriteUninstaller $INSTDIR\uninstall.exe