Skip to content

Commit

Permalink
Revert "Convert SSI includes to tt includes in source/"
Browse files Browse the repository at this point in the history
This reverts commit 25959f5.

Reviewed-by: Anton Arapov <anton@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #429)
  • Loading branch information
hlandau authored and mattcaswell committed Oct 16, 2023
1 parent b7519f6 commit 6679d91
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 17 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ source/*.patch
source/*.html
source/.htaccess
source/index.inc
source/index.md
source/old/*.html
source/old/*.md
source/old/*/
Expand Down
11 changes: 4 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ SIMPLE = $(H_TOP) \
policies/glossary.html \
$(H_SOURCE) \
source/.htaccess \
source/index.inc \
$(H_SUPPORT)
SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.html)
SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.inc source/old/$(S)/index.html)

SIMPLEDOCS = $(H_DOCS) \
docs/OpenSSLStrategicArchitecture.html \
Expand Down Expand Up @@ -569,9 +570,7 @@ source/old/$(1)/index.inc: $(RELEASEDIR)/old/$(1) bin/mk-filelist Makefile
@mkdir -p `dirname $$@`
@rm -f $$@
./bin/mk-filelist $(RELEASEDIR)/old/$(1) '' '*.gz' > $$@
source/old/$(1)/index.md: source/old/sub-index.md.tt inc/legalities.md \
source/old/$(1)/index.inc \
bin/from-tt Makefile
source/old/$(1)/index.md: source/old/sub-index.md.tt bin/from-tt Makefile
@mkdir -p `dirname $$@`
@rm -f $$@
./bin/from-tt -d source/old/$(1) \
Expand All @@ -596,8 +595,7 @@ endef
$(foreach S,fips $(SERIES) $(OLDSERIES2),$(eval $(call mkoldsourceindex,$(S),$(patsubst fips,FIPS,$(S)))))
$(foreach S,fips $(SERIES) $(OLDSERIES2),$(eval $(call mkoldsourcedirdata,$(S),$(patsubst fips,FIPS,$(S)))))

source/old/index.md: source/old/index.md.tt inc/legalities.md \
Makefile bin/from-tt Makefile
source/old/index.md: source/old/index.md.tt Makefile bin/from-tt Makefile
@mkdir -p `dirname $@`
@rm -f $@
./bin/from-tt releases='$(SERIES) $(OLDSERIES2) fips' $<
Expand All @@ -606,7 +604,6 @@ source/old/index.md: source/old/index.md.tt inc/legalities.md \

news/newslog.md: news/newsflash.inc
news/pgpkey.md: news/openssl-security.asc
source/index.md: source/index.inc

# Extra HTML dependencies (apart from the markdown file it comes from)

Expand Down
4 changes: 2 additions & 2 deletions source/dirdata.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
breadcrumbs: >-
[Home](../) : [Downloads](.)
breadcrumbs: |
[Home](/) : [Downloads](.)
sidebar: |
# [Downloads](.)
Expand Down
4 changes: 2 additions & 2 deletions source/index.md.tt → source/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ found [here](mirror.html).
<td>Date&nbsp;&nbsp;</td>
<td>File&nbsp;</td>
</tr>
[% INCLUDE "index.inc" %]
<!--#include virtual="index.inc" -->
</table>
</p>

Expand Down Expand Up @@ -94,4 +94,4 @@ even guaranteed to compile. Note that keeping a git local repository and
updating it every 24 hours is equivalent and will often be faster and
more efficient.

[% INCLUDE "../inc/legalities.md" %]
<!--#include virtual="/inc/legalities.shtml" -->
2 changes: 1 addition & 1 deletion source/old/dirdata.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
breadcrumbs: >-
breadcrumbs: |
[Home](/) : [Downloads](../) : [Old Releases](.)
sidebar: |
# [Downloads](.)
Expand Down
2 changes: 1 addition & 1 deletion source/old/index.md.tt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Here are the old releases.
- [[% release %]]([% release %])
[% END -%]

[% INCLUDE "../../inc/legalities.md" %]
<!--#include virtual="/inc/legalities.shtml" -->
2 changes: 1 addition & 1 deletion source/old/sub-dirdata.yaml.tt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
breadcrumbs: >-
breadcrumbs: |
[Home](/) : [Downloads](../..) : [Old Releases](../) : [[% release %]](.)
sidebar: |
# [Downloads](.)
Expand Down
4 changes: 2 additions & 2 deletions source/old/sub-index.md.tt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ breadcrumb: [% release %]
<td>Date&nbsp;&nbsp;</td>
<td>File&nbsp;</td>
</tr>
[% INCLUDE "index.inc" %]
<!--#include virtual="index.inc" -->
</table>
</p>

[% INCLUDE "../../../inc/legalities.md" %]
<!--#include virtual="/inc/legalities.shtml" -->

0 comments on commit 6679d91

Please sign in to comment.