Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
2444dfbd0f
!59 Upgrade to 1.9.6
From: @cherry530 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-05-12 01:18:11 +00:00
cherry530
3bc9776921 Upgrade to 1.9.6
Signed-off-by: cherry530 <707078654@qq.com>
2023-05-11 11:27:50 +08:00
openeuler-ci-bot
12a9351bd5
!57 [sync] PR-54: set clang_support to default OFF
From: @openeuler-sync-bot 
Reviewed-by: @small_leek, @zhoupengcheng11, @lvying6 
Signed-off-by: @lvying6, @small_leek
2023-03-03 01:54:50 +00:00
zhouwenpei
b4dddd8888 set clang_support to default OFF
(cherry picked from commit 8c7aaf653f4a92895df8b4e97a9d3bb969595eb0)
2023-03-02 14:17:13 +08:00
openeuler-ci-bot
a19bf27bac
!53 [sync] PR-52: 修复doxygen命令返回值问题
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-08-16 08:29:34 +00:00
caodongxia
5e2fa43d58 RTFGenerator should exit with 0 when gengrate file success
(cherry picked from commit b3501e36802c039a09bcbfdf294d69a8d72dccd5)
2022-08-16 16:11:50 +08:00
openeuler-ci-bot
c6450aa4f0
!47 Update to 1.9.3-1
From: @zhang__3125 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-06-22 11:12:42 +00:00
zhang__3125
fc3c35d364 Update to 1.9.3-1 2022-06-07 10:33:34 +08:00
openeuler-ci-bot
107b04203d
!46 Fix build error in openEuler-Mainline
From: @bzg1107 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-03-30 01:20:20 +00:00
baizg1107
8db1b676e5 fix build error 2022-03-29 17:26:57 +08:00
5 changed files with 33 additions and 38 deletions

View File

@ -1,25 +0,0 @@
From c23a12be8a23b9de7f6e78236cf1b571213cb5f9 Mon Sep 17 00:00:00 2001
From: si-gui <swx458333@huawei.com>
Date: Mon, 12 Apr 2021 16:42:28 +0800
Subject: [PATCH] RTFGenerator should exit with 0 when gengrate file success
---
src/doxygen.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 6163e81..31f6886 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9974,7 +9974,7 @@ void readConfiguration(int argc, char **argv)
RTFGenerator::writeStyleSheetFile(t);
}
cleanUpDoxygen();
- exit(1);
+ exit(0);
}
else if (qstricmp(formatName.data(),"html")==0)
{
--
2.30.0

Binary file not shown.

BIN
doxygen-1.9.6.src.tar.gz Normal file

Binary file not shown.

View File

@ -1,26 +1,31 @@
%global xapian_core_support ON %global xapian_core_support "ON"
%global BuildDir Out %global BuildDir "Out"
%global clang_support OFF
Name: doxygen Name: doxygen
Epoch: 1 Epoch: 1
Version: 1.9.2 Version: 1.9.6
Release: 1 Release: 1
Summary: A documentation system for C/C++ Summary: A documentation system for C/C++
License: GPL+ License: GPL+
Url: http://www.doxygen.nl Url: https://www.doxygen.nl
Source0: https://nchc.dl.sourceforge.net/project/%{name}/rel-%{version}/%{name}-%{version}.src.tar.gz Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz
Source1: doxywizard.desktop Source1: doxywizard.desktop
Source2: doxywizard-icons.tar.xz
Patch0: RTFGenerator-should-exit-with-0-when-gengrate-file-s.patch
BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter
BuildRequires: tex(dvips) tex(latex) tex(multirow.sty) tex(sectsty.sty) tex(tocloft.sty) BuildRequires: python3-libxml2 texlive-bibtex
BuildRequires: tex(xtab.sty) tex(import.sty) tex(tabu.sty) tex(appendix.sty) BuildRequires: desktop-file-utils graphviz flex bison cmake
BuildRequires: tex(adjustbox.sty) /usr/bin/epstopdf texlive-epstopdf ghostscript gettext
BuildRequires: desktop-file-utils graphviz flex bison cmake git
%if %{xapian_core_support} == "ON" %if %{xapian_core_support} == "ON"
BuildRequires: xapian-core-devel zlib-devel BuildRequires: xapian-core-devel zlib-devel
%endif %endif
%if "x%{?clang_support}" == "xON"
BuildRequires: llvm-devel
BuildRequires: clang-devel
%endif
Requires: perl-interpreter Requires: perl-interpreter
Requires: graphviz
%description %description
Doxygen is the de facto standard tool for generating documentation from Doxygen is the de facto standard tool for generating documentation from
annotated C++ sources, but it also supports other popular programming annotated C++ sources, but it also supports other popular programming
@ -46,7 +51,6 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
install -d %{BuildDir} install -d %{BuildDir}
cd %{BuildDir} cd %{BuildDir}
%cmake \ %cmake \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-Dbuild_doc=OFF \ -Dbuild_doc=OFF \
-Dbuild_wizard=ON \ -Dbuild_wizard=ON \
-Dbuild_xmlparser=ON \ -Dbuild_xmlparser=ON \
@ -54,6 +58,7 @@ cd %{BuildDir}
-DMAN_INSTALL_DIR=%{_mandir}/man1 \ -DMAN_INSTALL_DIR=%{_mandir}/man1 \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-Duse_libclang=%{clang_support} \
.. ..
cd - cd -
%make_build -C %{BuildDir} %make_build -C %{BuildDir}
@ -75,7 +80,7 @@ rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/d
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%check %check
make tests -C %{BuildDir} /usr/bin/ctest --test-dir %{BuildDir} --output-on-failure --force-new-ctest-process -j6
%files %files
%doc LANGUAGE.HOWTO README.md %doc LANGUAGE.HOWTO README.md
@ -95,6 +100,21 @@ make tests -C %{BuildDir}
%{_datadir}/icons/hicolor/*/apps/doxywizard.png %{_datadir}/icons/hicolor/*/apps/doxywizard.png
%changelog %changelog
* Mon Apr 24 2023 xu_ping <707078654@qq.com> - 1:1.9.6-1
- Upgrade package to 1.9.6 version
* Wed Sep 21 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1:1.9.3-3
- set clang_support to default OFF
* Mon Aug 15 2022 caodongxia <caodongxia@h-partners.com> - 1:1.9.3-2
- RTFGenerator should exit with 0 when gengrate file success
* Mon Apr 11 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1:1.9.3-1
- Update to 1.9.3-1
* Tue Mar 29 2022 baizhonggui<baizhonggui@huawei.com> - 1.9.2-2
- Fix build error for string compare
* Thu Dec 30 2021 zoulin<zoulin13@huawei.com> - 1.9.2-1 * Thu Dec 30 2021 zoulin<zoulin13@huawei.com> - 1.9.2-1
- Update version to 1.9.2 and removeing the "graphviz" dependency - Update version to 1.9.2 and removeing the "graphviz" dependency

BIN
doxywizard-icons.tar.xz Normal file

Binary file not shown.