mirror of https://github.com/CGAL/cgal
Update the tools to build an rpm of the manual tools.
"make CGAL-manual-tools" to build the binary rpm. "make CGAL-manual-tools.src" to build the source src.rpm.
This commit is contained in:
Laurent Rineau
parent
cf6fe3a5ec
commit
2d17f7187f
|
|
@ -1938,6 +1938,7 @@ Maintenance/rpm/SOURCES/CGAL-README.Fedora svneol=native#text/plain
|
|||
Maintenance/rpm/SOURCES/CGAL-build-library.dpatch svneol=native#text/x-diff
|
||||
Maintenance/rpm/SOURCES/CGAL-install_cgal-SUPPORT_REQUIRED.patch svneol=native#text/x-diff
|
||||
Maintenance/rpm/SOURCES/CGAL_manual_tools-cc_extract_html.patch svneol=native#text/x-diff
|
||||
Maintenance/rpm/SOURCES/CGAL_manual_tools-cc_ref_wizard.patch -text svneol=unset#text/x-diff
|
||||
Maintenance/rpm/SOURCES/CGAL_manual_tools-cgal_manual.patch svneol=native#text/x-diff
|
||||
Maintenance/rpm/SOURCES/CGAL_manual_tools-config.patch svneol=native#text/x-diff
|
||||
Maintenance/rpm/SOURCES/CGAL_manual_tools-latex_to_html.patch svneol=native#text/x-diff
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ all:
|
|||
#
|
||||
#############################################################################
|
||||
|
||||
CGAL_MANUAL_REVISION:=$(shell rpm -q --qf '%{version}\n' --specfile SPECS/CGAL-manual-tools.spec | head -1)
|
||||
CGAL_MANUAL_REVISION:=$(shell svn info . | awk '/Revision/ {print $$2}')
|
||||
CGAL_MANUAL_RELEASE_NUMBER:=$(shell rpm -q --qf '%{release}\n' --specfile SPECS/CGAL-manual-tools.spec | head -1)
|
||||
|
||||
RPM_OPTIONS+= --define "cgal_manual_revision $(CGAL_MANUAL_REVISION)"
|
||||
|
|
@ -47,11 +47,14 @@ CGAL_MANUAL_PACKAGE_DEPS = \
|
|||
$(CGAL_MANUAL_PACKAGE_SOURCES) \
|
||||
SPECS/CGAL-manual-tools.spec
|
||||
|
||||
.PHONY:: prepare-CGAL-manual-tools-sources
|
||||
.PHONY:: prepare-CGAL-manual-tools-sources echo-manual-revision
|
||||
|
||||
echo-manual-revision:
|
||||
@echo "CGAL_MANUAL_REVISION=$(CGAL_MANUAL_REVISION)"
|
||||
|
||||
prepare-CGAL-manual-tools-sources: $(CGAL_MANUAL_PACKAGE_SOURCES)
|
||||
|
||||
SOURCES/Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz:
|
||||
SOURCES/Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz: echo-manual-revision
|
||||
cd SOURCES && svn export -r $(CGAL_MANUAL_REVISION) --force \
|
||||
$(CGAL_URL)/Manual_tools && \
|
||||
tar czf Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz Manual_tools/
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: src/cc_extract_html.C
|
||||
Index: src/cc_extract_html.cpp
|
||||
===================================================================
|
||||
--- src/cc_extract_html.C (revision 29890)
|
||||
+++ src/cc_extract_html.C (working copy)
|
||||
--- src/cc_extract_html.cpp (revision 29890)
|
||||
+++ src/cc_extract_html.cpp (working copy)
|
||||
@@ -178,7 +178,7 @@
|
||||
config_path = s;
|
||||
s = getenv("LATEX_CONV_INPUTS");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
--- scripts/cc_ref_wizard~ 2006-02-14 11:08:15.000000000 +0100
|
||||
+++ scripts/cc_ref_wizard 2006-08-17 13:28:12.000000000 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
# Path to the configuration files of the latex_converter: It contains
|
||||
# the skeletons for the reference manual pages that will be costumized
|
||||
# by this skript.
|
||||
-# set LATEX_CONV_CONFIG = /CGAL/Tools/latex_converter_config
|
||||
+set LATEX_CONV_CONFIG = /usr/share/CGAL/latex_conv_config
|
||||
|
||||
# Author of the refernce page
|
||||
# set REF_WIZARD_AUTHOR = ""
|
||||
|
|
@ -1,10 +1,8 @@
|
|||
Index: install.sh
|
||||
===================================================================
|
||||
--- install.sh (revision 30346)
|
||||
+++ install.sh (working copy)
|
||||
--- /tmp/ediff1660Atb 2007-05-11 16:44:47.000000000 +0200
|
||||
+++ /home/lrineau/CGAL/Packages/trunk/Manual_tools/install.sh 2007-05-11 16:43:42.000000000 +0200
|
||||
@@ -2,6 +2,12 @@
|
||||
|
||||
source install.config
|
||||
. ./install.config
|
||||
|
||||
+make -C src LATEX_CONV_INPUTS=$LATEX_CONV_INPUTS || exit 1
|
||||
+
|
||||
|
|
@ -15,20 +13,3 @@ Index: install.sh
|
|||
install -d $LATEX_CONV_BIN $LATEX_CONV_CONFIG $STYLE_FILES $STYLE_FILES/eps_tabs $STYLE_FILES/eps_tabs_grey
|
||||
|
||||
cd src
|
||||
@@ -10,6 +16,9 @@
|
||||
make install
|
||||
cd ..
|
||||
|
||||
+
|
||||
+make -C src install LATEX_CONV_CONFIG=$LATEX_CONV_CONFIG|| exit 1
|
||||
+
|
||||
cp scripts/index_fix scripts/cc_make_ref_pages scripts/cc_ref_wizard $LATEX_CONV_BIN
|
||||
cp sty/*.sty $STYLE_FILES
|
||||
cp sty/eps_tabs/*.pdf sty/eps_tabs/*.eps $STYLE_FILES/eps_tabs
|
||||
@@ -22,4 +31,4 @@
|
||||
echo ""
|
||||
echo "================================================"
|
||||
echo "Manual_tools successfullly installed. Do not forget to update \$TEXINPUTS:"
|
||||
-echo "export TEXINPUTS=\".:$STYLE_FILES:\$TEXINPUTS\""
|
||||
\ No newline at end of file
|
||||
+echo "export TEXINPUTS=\".:$STYLE_FILES:\$TEXINPUTS\""
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%{!?cgal_manual_revision: %define cgal_manual_revision 36165}
|
||||
%{!?cgal_manual_revision: %define cgal_manual_revision 45627}
|
||||
|
||||
Name: CGAL-manual-tools
|
||||
Version: %{cgal_manual_revision}
|
||||
|
|
@ -16,6 +16,7 @@ Patch2: CGAL_manual_tools-perl.patch
|
|||
Patch3: CGAL_manual_tools-cgal_manual.patch
|
||||
Patch4: CGAL_manual_tools-cc_extract_html.patch
|
||||
Patch5: CGAL_manual_tools-latex_to_html.patch
|
||||
Patch6: CGAL_manual_tools-cc_ref_wizard.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: bison flex
|
||||
|
|
@ -36,6 +37,7 @@ Specification and Manual Writing Tools for C++ Reference Manuals
|
|||
%patch3 -p0
|
||||
%patch4 -p0
|
||||
%patch5 -p0
|
||||
%patch6 -p0
|
||||
|
||||
%build
|
||||
source install.config
|
||||
|
|
@ -44,6 +46,7 @@ make -C src LATEX_CONV_INPUTS=$LATEX_CONV_INPUTS \
|
|||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
sed -i.bak -e 's|/usr|$RPM_BUILD_ROOT/usr|g' install.config
|
||||
./install.sh
|
||||
[ -d $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL ] || mkdir -p $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL
|
||||
cp -r doc_tex/Manual $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL
|
||||
|
|
@ -71,55 +74,58 @@ rm -rf $RPM_BUILD_ROOT
|
|||
/usr/share/CGAL/latex_conv_config
|
||||
|
||||
%changelog
|
||||
* Sat Feb 10 2007 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 36165-1
|
||||
* Fri May 11 2007 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 38638-1%{?dist}
|
||||
- Update to revision 38638.
|
||||
|
||||
* Sat Feb 10 2007 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 36165-1%{?dist}
|
||||
- Updated to revision 36165.
|
||||
|
||||
* Tue Jul 4 2006 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 32190-1
|
||||
* Tue Jul 4 2006 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 32190-1%{?dist}
|
||||
- Updated to revision 32190.
|
||||
- Added an optionnal macro %%cgal_manual_revision, that can be used at compile time, to define another revision. For example:
|
||||
rpmbuild --define "%%cgal_manual_revision 32195"
|
||||
|
||||
* Thu May 11 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 31112-1
|
||||
* Thu May 11 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 31112-1%{?dist}
|
||||
- Update to revision 31112.
|
||||
- Remove BuildRequires: sed.
|
||||
- Change License:, to remove a rpmlint warning.
|
||||
|
||||
* Wed Apr 26 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30764-1
|
||||
* Wed Apr 26 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30764-1%{?dist}
|
||||
- Updated to revision 30764.
|
||||
|
||||
* Mon Apr 19 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30346-1
|
||||
* Mon Apr 19 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30346-1%{?dist}
|
||||
- Updated to revision 30675.
|
||||
|
||||
* Thu Apr 13 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30269-2
|
||||
* Thu Apr 13 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30269-2%{?dist}
|
||||
- Fix the prep part: no need for two setup macros.
|
||||
|
||||
* Wed Apr 12 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30269-1
|
||||
* Wed Apr 12 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30269-1%{?dist}
|
||||
- Updated to revision 30269.
|
||||
- Fixed the warnings (included twice, etc.) of rpmbuild.
|
||||
- Passed rpmlint.
|
||||
- Updated patch5 to new revision.
|
||||
- Changed my email address.
|
||||
|
||||
* Tue Apr 11 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30224
|
||||
* Tue Apr 11 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30224%{?dist}
|
||||
- Updated to revision 30224.
|
||||
|
||||
* Fri Apr 7 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30090
|
||||
* Fri Apr 7 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30090%{?dist}
|
||||
- Updated to revision 30090.
|
||||
|
||||
* Thu Apr 6 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30080
|
||||
* Thu Apr 6 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30080%{?dist}
|
||||
- Updated to revision 30080.
|
||||
|
||||
* Wed Apr 5 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30025
|
||||
* Wed Apr 5 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 30025%{?dist}
|
||||
- Updated to revision 30025.
|
||||
- Source0 and Source1 now have %%version in their names.
|
||||
|
||||
* Tue Apr 4 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29933
|
||||
* Tue Apr 4 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29933%{?dist}
|
||||
- Updated to revision 29933.
|
||||
|
||||
* Mon Apr 3 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29922
|
||||
* Mon Apr 3 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29922%{?dist}
|
||||
- Updated to revision 29922.
|
||||
|
||||
* Fri Mar 31 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29890
|
||||
* Fri Mar 31 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29890%{?dist}
|
||||
- Updated to 29890.
|
||||
- New patch, for latex_to_html
|
||||
- Updated the CGAL_manual_tools-config.patch, to add
|
||||
|
|
@ -128,17 +134,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||
- Added ipe.sty to files
|
||||
- Move bib files to the bibtex installation.
|
||||
|
||||
* Thu Mar 30 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29841
|
||||
* Thu Mar 30 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29841%{?dist}
|
||||
- Updated to rev. 29841. No longer need for patch2
|
||||
- Specify the two scripts of developer_scripts/ that need to be installed,
|
||||
to avoid things like cgal_manual.orig!
|
||||
|
||||
* Tue Mar 7 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29111
|
||||
* Tue Mar 7 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 29111%{?dist}
|
||||
- Updated to Manual_tools rev 29111., Manual rev 29112.
|
||||
- Manual_tools are now pulled from SVN too.
|
||||
- Some patches are now included in SVN.
|
||||
|
||||
* Fri Mar 3 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 3.12
|
||||
* Fri Mar 3 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 3.12%{?dist}
|
||||
- Added cgal_manual and dependancies
|
||||
- Added a call to texhash
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue