pyOpenSSL

Merge lp://staging/~zseil/pyopenssl/cygwin-doc into lp://staging/~exarkun/pyopenssl/trunk

  1. cygwin-doc
  2. Merge into trunk
Proposed by Ziga Seilnacht
Status: Rejected
Rejected by: Jean-Paul Calderone
Proposed branch: lp://staging/~zseil/pyopenssl/cygwin-doc
Merge into: lp://staging/~exarkun/pyopenssl/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~zseil/pyopenssl/cygwin-doc
Reviewer Review Type Date Requested Status
Jean-Paul Calderone Pending
Review via email: mp+11019@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ziga Seilnacht (zseil) wrote :

This branch contains backported fixes from Python's version of documentation tools needed for building documentation on cygwin.

Unmerged revisions

124. By Ziga Seilnacht

Work around limitation of Cygwin Perl: To avoid a permission denial, we need to do the inplace-edit with a backup file.

Backport of Python's revision 26727.

123. By Ziga Seilnacht

Use a test for PDF support that is more portable across teTeX major versions.

Backport of Python's revision 39232. Needed on cygwin.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/tools/node2label.pl'
2--- doc/tools/node2label.pl 2008-02-19 01:50:23 +0000
3+++ doc/tools/node2label.pl 2009-09-01 21:56:17 +0000
4@@ -1,14 +1,19 @@
5 #! /usr/bin/env perl
6
7+# On Cygwin, we actually have to generate a temporary file when doing
8+# the inplace edit, or we'll get permission errors. Not sure who's
9+# bug this is, except that it isn't ours. To deal with this, we
10+# generate backups during the edit phase and remove them at the end.
11+#
12 use English;
13-$INPLACE_EDIT = '';
14+$INPLACE_EDIT = '.bak';
15
16 # read the labels, then reverse the mappings
17 require "labels.pl";
18
19 %nodes = ();
20 my $key;
21-# sort so that we get a consistent assignment for nodes with multiple labels
22+# sort so that we get a consistent assignment for nodes with multiple labels
23 foreach $label (sort keys %external_labels) {
24 $key = $external_labels{$label};
25 $key =~ s|^/||;
26@@ -53,3 +58,7 @@
27 foreach $oldname (keys %newnames) {
28 rename($oldname, $newnames{$oldname});
29 }
30+
31+foreach $filename (glob('*.bak')) {
32+ unlink($filename);
33+}
34
35=== modified file 'doc/tools/texinputs/howto.cls'
36--- doc/tools/texinputs/howto.cls 2008-02-19 01:50:23 +0000
37+++ doc/tools/texinputs/howto.cls 2009-09-01 21:49:45 +0000
38@@ -6,6 +6,7 @@
39 \ProvidesClass{howto}
40 [1998/02/25 Document class (Python HOWTO)]
41
42+\RequirePackage{ifpdf}
43 \RequirePackage{pypaper}
44
45 % Change the options here to get a different set of basic options, This
46@@ -23,7 +24,7 @@
47 % distribution.
48 %
49 % The "fancyhdr" package makes nicer page footers reasonable to
50-% implement, and is used to put the chapter and section information in
51+% implement, and is used to put the chapter and section information in
52 % the footers.
53 %
54 \RequirePackage{fancyhdr}\typeout{Using fancier footers than usual.}
55@@ -49,7 +50,8 @@
56 %
57 \renewcommand{\maketitle}{
58 \py@doHorizontalRule
59- \@ifundefined{pdfinfo}{}{{
60+ \ifpdf
61+ \begingroup
62 % This \def is required to deal with multi-line authors; it
63 % changes \\ to ', ' (comma-space), making it pass muster for
64 % generating document info in the PDF file.
65@@ -58,7 +60,8 @@
66 /Author (\@author)
67 /Title (\@title)
68 }
69- }}
70+ \endgroup
71+ \fi
72 \begin{flushright}
73 {\rm\Huge\py@HeaderFamily \@title} \par
74 {\em\large\py@HeaderFamily \py@release} \par
75@@ -84,7 +87,7 @@
76 \py@doHorizontalRule
77 \vspace{12pt}
78 \py@doing@page@targetstrue
79-}
80+}
81
82 % Fix the theindex environment to add an entry to the Table of
83 % Contents; this is much nicer than just having to jump to the end of
84
85=== modified file 'doc/tools/texinputs/manual.cls'
86--- doc/tools/texinputs/manual.cls 2008-02-19 01:50:23 +0000
87+++ doc/tools/texinputs/manual.cls 2009-09-01 21:49:45 +0000
88@@ -6,6 +6,7 @@
89 \ProvidesClass{manual}
90 [1998/03/03 Document class (Python manual)]
91
92+\RequirePackage{ifpdf}
93 \RequirePackage{pypaper}
94
95 % Change the options here to get a different set of basic options, but only
96@@ -23,7 +24,7 @@
97 % distribution.
98 %
99 % The "fancyhdr" package makes nicer page footers reasonable to
100-% implement, and is used to put the chapter and section information in
101+% implement, and is used to put the chapter and section information in
102 % the footers.
103 %
104 \RequirePackage{fancyhdr}\typeout{Using fancier footers than usual.}
105@@ -63,7 +64,8 @@
106 \let\footnotesize\small
107 \let\footnoterule\relax
108 \py@doHorizontalRule%
109- \@ifundefined{pdfinfo}{}{{
110+ \ifpdf
111+ \begingroup
112 % This \def is required to deal with multi-line authors; it
113 % changes \\ to ', ' (comma-space), making it pass muster for
114 % generating document info in the PDF file.
115@@ -72,7 +74,8 @@
116 /Author (\@author)
117 /Title (\@title)
118 }
119- }}
120+ \endgroup
121+ \fi
122 \begin{flushright}%
123 {\rm\Huge\py@HeaderFamily \@title \par}%
124 {\em\LARGE\py@HeaderFamily \py@release \par}

Subscribers

People subscribed via source and target branches

to status/vote changes: