Ignore:
Timestamp:
Mar 30, 2015 4:14:54 PM (3 years ago)
Author:
tkr
Message:

temporarily committing release candidate

Location:
stable/2.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.0/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
        6 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.5
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.4/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.3.2/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.2/
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.5.2/
         5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.2/
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.2/
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.5.2/
        88Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.10/
        99Data/miplib3  https://projects.coin-or.org/svn/Data/miplib3/releases/1.2.6/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
        11 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
        12 Clp  https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
        13 Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
        14 
        15 
        16 
        17 
         10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.10.6/CoinUtils
         11Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.59.4/Cgl
         12Clp  https://projects.coin-or.org/svn/Clp/releases/1.16.6/Clp
         13Osi  https://projects.coin-or.org/svn/Osi/releases/0.107.4/Osi
  • stable/2.9/Cbc/Makefile.in

    r2132 r2175  
    182182COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    183183COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     184COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     185COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    184186COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    185187COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
     
    188190COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
    189191COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     192COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     193COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    190194COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
    191195COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
     
    407411coin_doxy_usedot = @coin_doxy_usedot@
    408412coin_have_doxygen = @coin_have_doxygen@
     413coin_have_latex = @coin_have_latex@
    409414datadir = @datadir@
    410415exec_prefix = @exec_prefix@
     
    488493# Files that are generated and should be cleaned with make distclean
    489494DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    490 DocFiles = README AUTHORS LICENSE
     495DocFiles = README AUTHORS LICENSE 
    491496DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     497COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     498COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    492499all: all-recursive
    493500
     
    989996        rm -f $(addlibsdir)/cbc_addlibs.txt
    990997
    991 install-doc: $(DocFiles)
     998doxygen-docs:
     999        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1000          if test -d "doxydoc/"; then \
     1001            doxygen doxydoc/doxygen.conf;\
     1002          fi;\
     1003        fi
     1004
     1005pdf-doxygen-docs: doxygen-docs
     1006        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1007          if test -d "doxydoc/latex"; then \
     1008            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     1009              cd doxydoc/latex;\
     1010              $(MAKE) pdf;\
     1011              cd -;\
     1012            fi;\
     1013          fi;\
     1014        fi
     1015
     1016clean-doxygen-docs:
     1017        if test -d "doxydoc/"; then \
     1018          cd doxydoc ;\
     1019          rm -rf html latex *.log *.tag;\
     1020        fi
     1021
     1022install-doxygen-docs: doxygen-docs
     1023        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1024          if test -d "doxydoc/"; then \
     1025            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     1026            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     1027            if test -f "doxydoc/latex/refman.pdf"; then \
     1028              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     1029            fi;\
     1030            if test -d "doxydoc/html"; then \
     1031              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     1032              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     1033              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     1034            fi;\
     1035          fi;\
     1036        fi
     1037
     1038uninstall-doxygen-docs:
     1039        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     1040          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     1041        fi
     1042        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     1043          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     1044        fi
     1045
     1046all-doxygen-docs:
     1047        for dir in $(subdirs) ; do \
     1048          do_project=true;\
     1049          for proj in $(COIN_SKIP_DOXYGEN); do\
     1050            if test $$dir = $$proj; then\
     1051              do_project=false;\
     1052            fi;\
     1053          done;\
     1054          if test -r $$dir/doxydoc & $$do_project = true; then \
     1055            (cd $$dir ; $(MAKE) doxygen-docs) \
     1056          fi ; \
     1057        done ;
     1058
     1059clean-all-doxygen-docs:
     1060        for dir in $(subdirs) ; do \
     1061          if test -r $$dir/doxydoc ; then \
     1062            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     1063          fi ; \
     1064        done ;
     1065
     1066install-all-doxygen-docs: all-doxygen-docs
     1067        for dir in $(subdirs) ; do \
     1068          do_project=true;\
     1069          for proj in $(COIN_SKIP_DOXYGEN); do\
     1070            if test $$dir = $$proj; then\
     1071              do_project=false;\
     1072            fi;\
     1073          done;\
     1074          if test -r $$dir/doxydoc & $$do_project = true; then \
     1075            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     1076          fi ; \
     1077        done ;
     1078
     1079uninstall-all-doxygen-docs:
     1080        for dir in $(subdirs) ; do \
     1081          if test -r $$dir/doxydoc ; then \
     1082            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     1083          fi ; \
     1084        done ;
     1085
     1086install-doc: $(DocFiles)
    9921087        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    9931088        for file in $(DocFiles); do \
    9941089          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    9951090          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    996         done
     1091        done 
    9971092
    9981093uninstall-doc:
Note: See TracChangeset for help on using the changeset viewer.