Skip to content

Add /dev/dependencies.html and remove internals.html #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bagder wants to merge 1 commit into from
Closed

Add /dev/dependencies.html and remove internals.html #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ErrorDocument 404 /404.html
RedirectPermanent /news.html https://curl.se/changes.html
RedirectPermanent /devel.html https://curl.se/dev/
RedirectPermanent /auto/ https://curl.se/dev/
RedirectPermanent /docs/internals.html https://curl.se/dev/internals.html
RedirectPermanent /docs/internals.html https://curl.se/dev/dependencies.html
RedirectPermanent /docs/contribute.html https://curl.se/dev/contribute.html
RedirectPermanent /docs/runtests.html https://curl.se/dev/runtests.html
RedirectPermanent /docs/testcurl.html https://curl.se/dev/testcurl.html
Expand All @@ -22,6 +22,7 @@ RedirectMatch "^/.git" https://curl.se/dev/source.html
RedirectPermanent /dev/secprocess.html https://curl.se/dev/vuln-disclosure.html
RedirectPermanent /dev/security.html https://curl.se/dev/vuln-disclosure.html
RedirectPermanent /dev/FILEFORMAT.md https://github.com/curl/curl/blob/master/tests/FILEFORMAT.md
RedirectPermanent /dev/internals.html https://curl.se/dev/dependencies.html
# old advisory pages
RedirectPermanent /docs/adv_2018-70a2.html https://curl.se/docs/CVE-2018-0500.html
RedirectPermanent /docs/adv_2018-82c2.html https://curl.se/docs/CVE-2018-1000300.html
Expand Down
12 changes: 6 additions & 6 deletions dev/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ PAGES = \
code-review.html \
code-style.html \
contribute.html \
dependencies.html \
deprecate.html \
experimental.html \
feature-window.html \
foot.html \
head.html \
howto.html \
index.html \
internals.html \
keywords.html \
missing.html \
new-protocol.html \
Expand Down Expand Up @@ -108,14 +108,14 @@ deprecate.html: _deprecate.html $(MAINPARTS) deprecate.gen
deprecate.gen: $(DOCROOT)/DEPRECATE.md
$(MARKDOWN) < $< > $@

experimental.html: _experimental.html $(MAINPARTS) experimental.gen
dependencies.html: _dependencies.html $(MAINPARTS) depver.gen
$(ACTION)
experimental.gen: $(DOCROOT)/EXPERIMENTAL.md
$(MARKDOWN) < $< > $@
depver.gen: $(DOCROOT)/DEPENDENCIES.md ./mkdepver.pl
./mkdepver.pl < $< > $@

internals.html: _internals.html $(MAINPARTS) internals.gen
experimental.html: _experimental.html $(MAINPARTS) experimental.gen
$(ACTION)
internals.gen: $(DOCROOT)/INTERNALS.md
experimental.gen: $(DOCROOT)/EXPERIMENTAL.md
$(MARKDOWN) < $< > $@

vuln-disclosure.html: _vuln-disclosure.html $(MAINPARTS) disclosure.gen bliss.t
Expand Down
2 changes: 1 addition & 1 deletion dev/_code-review.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<br><a href="/libcurl/abi.html">ABI</a>
<br><a href="code-style.html">Code style</a>
<br><a href="contribute.html">Contribute</a>
<br><a href="dependencies.html">Dependency versions</a>
<br><a href="/mail/">Mailing Lists</a>
<br><a href="internals.html">Internals</a>
</div>

#include "code-review.gen"
Expand Down
2 changes: 1 addition & 1 deletion dev/_code-style.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<br><a href="code-review.html">Code review</a>
<br><a href="contribute.html">Contribute</a>
<br><a href="/mail/">Mailing Lists</a>
<br><a href="internals.html">Internals</a>
<br><a href="dependencies.html">Dependency versions</a>
</div>

#include "code-style.gen"
Expand Down
2 changes: 1 addition & 1 deletion dev/_contribute.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<div class="relatedbox">
<b>Related:</b>
<br><a href="dependencies.html">Dependency versions</a>
<br><a href="/mail/">Mailing Lists</a>
<br><a href="internals.html">Internals</a>
<br><a href="/docs/bugs.html">Report Bugs</a>
</div>

Expand Down
32 changes: 32 additions & 0 deletions dev/_dependencies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "_doctype.html"
<html>
<head> <title>Dependency versions</title>
#include "css.t"
</head>

#define DEVEL_DEPENDENCIES
#define CURL_URL dev/dependencies.html

#include "_menu.html"
#include "setup.t"

WHERE2(Development, "/dev/", Dependency versions)

<div class="relatedbox">
<b>Related:</b>
<br><a href="deprecate.html">Deprecate</a>
<br><a href="experimental.html">Experimental</a>
<br><a href="/docs/bugs.html">Report Bugs</a>
<br><a href="/docs/todo.html">TODO</a>
</div>

TITLE(Dependencies and their minimum versions)
<p>
curl and libcurl attempt to support the following dependencies at this
version or greater.

#include "depver.gen"
#include "_footer.html"

</body>
</html>
2 changes: 1 addition & 1 deletion dev/_deprecate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<div class="relatedbox">
<b>Related:</b>
<br><a href="internals.html">Internals</a>
<br><a href="dependencies.html">Dependency versions</a>
<br><a href="/mail/">Mailing Lists</a>
<br><a href="/docs/knownbugs.html">Known Bugs</a>
<br><a href="/docs/bugs.html">Report Bugs</a>
Expand Down
2 changes: 1 addition & 1 deletion dev/_experimental.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<div class="relatedbox">
<b>Related:</b>
<br><a href="internals.html">Internals</a>
<br><a href="dependencies.html">Dependency versions</a>
<br><a href="/mail/">Mailing Lists</a>
<br><a href="/docs/knownbugs.html">Known Bugs</a>
<br><a href="/docs/bugs.html">Report Bugs</a>
Expand Down
8 changes: 3 additions & 5 deletions dev/_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@
here for your convenience.
<ul>

<li> <a href="dependencies.html">Dependency versions</a> - minimum supported
versions for curl's dependencies

<li> <a href="/docs/todo.html">TODO</a> - we try to maintain lists of what
things you could <a href="/help.html">help us with</a> and features a future
curl release might get.
Expand All @@ -121,11 +124,6 @@
to consider when you contribute with patches and source code to the curl
project.

<li>
<a href="internals.html">Internals</a> describes how things work
internally in curl, for code hackers, bug fixers and generally interested
parties.

<li>
Learn how to write a <a href="advisory.html">Security Advisory</a> for curl.

Expand Down
25 changes: 0 additions & 25 deletions dev/_internals.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev/_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<a href="/dev/code-style.html">Code Style</a>
<a href="/dev/contribute.html">Contribute</a>
<a href="/dev/deprecate.html">Deprecate</a>
<a href="/dev/dependencies.html">Dependency versions</a>
<a href="/dev/experimental.html">Experimental</a>
<a href="/dev/internals.html">Internals</a>
<a href="/dev/new-protocol.html">New protocol</a>
<a href="/dev/release-procedure.html">Release procedure</a>
<a href="/dev/roadmap.html">Roadmap</a>
Expand Down
2 changes: 1 addition & 1 deletion dev/_new-protocol.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<br><a href="/libcurl/abi.html">ABI</a>
<br><a href="code-style.html">Code style</a>
<br><a href="contribute.html">Contribute</a>
<br><a href="dependencies.html">Dependency versions</a>
<br><a href="/mail/">Mailing Lists</a>
<br><a href="internals.html">Internals</a>
</div>

#include "new-protocol.gen"
Expand Down
69 changes: 69 additions & 0 deletions dev/mkdepver.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/usr/bin/env perl
#***************************************************************************
# _ _ ____ _
# Project ___| | | | _ \| |
# / __| | | | |_) | |
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
# are also available at https://curl.se/docs/copyright.html.
#
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
# copies of the Software, and permit persons to whom the Software is
# furnished to do so, under the terms of the COPYING file.
#
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
# SPDX-License-Identifier: curl
#
###########################################################################

my $mode = 0;
my $i = 0;

while(<STDIN>) {
if(/^## Dependencies/) {
# the subtitle for run-time dependencies
print "<h2>Run-time dependencies</h2>\n";
print "<table>\n";
print "<tr><th>library</th><th>version</th><th>release date</th>\n";
$mode = 1;
}
elsif(/^## Build tools/) {
print "</table>\n";
print "<h2>Build dependencies</h2>\n";
print "<table>\n";
print "<tr><th>tool</th><th>version</th><th>release date</th>\n";
$mode = 2;
$i = 0;
}
elsif(/^## Testing/) {
print "</table>\n";
print "<h2>Test dependencies</h2>\n";
print "<table>\n";
print "<tr><th>tool</th><th>version</th><th>release date</th>\n";
$mode = 3;
$i = 0;
}
elsif(/^##/) {
$mode = 0;
}

if(/^ *- (.*) ([^(]*)(.*)/ && $mode) {
my ($what, $ver, $date) = ($1, $2, $3);
$what =~ s/ +$//;
$ver =~ s/ +$//;
$date =~ s/^\(//; # remove a leading open paren
$date =~ s/\)//; # remove the first close paren
printf "<tr class=\"%s\"><td>$what</td><td>$ver</td><td>$date</td>\n",
$i & 1 ? "odd" : "even";
$i++;
}
}
print "</table>\n";