Remove, by default, CCBY4 license.

.github/workflows/draft.yml

@@ -34,7 +34,8 @@ jobs:
           popd
 
       - name: Build (PDF)
-        run: b2 --debug-configuration -d+2 doc-stage=draft,final
+        run: |
+          b2 --debug-configuration -d+2 doc-stage=draft,final
 
       - name: Upload
         uses: actions/upload-artifact@main

build.jam

@@ -1,8 +1,9 @@
 import toolset ;
 import feature ;
 
-feature.feature doc-stage : draft final : propagated symmetric implicit ;
+feature.feature doc-stage : draft final : propagated symmetric ;
 feature.feature verbose : off on : propagated incidental ;
+feature.feature license : off on : propagated symmetric ;
 
 project /ecosystem
 	: build-dir .build/b2
@@ -12,21 +13,45 @@ local tex-src = [ glob src/eco_*.tex src/in_*.tex src/*.ist ] ;
 local latexmkrc = [ glob src/*latexmkrc* ] ;
 local _ = " " ;
 
+rule latex-defs ( properties * )
+{
+	local pretex ;
+	if <doc-stage>final in $(properties)
+	{
+		pretex += "\\\\def\\\\isofinal{yes}" ;
+	}
+	if <license>on in $(properties)
+	{
+		pretex += "\\\\def\\\\license{yes}" ;
+	}
+	return <flags>"-usepretex=\"$(pretex:J= )\"" ;
+}
+
 make ecosystem.pdf : src/ecosystem.tex
 	:	@latexmk
 	:	<dependency>$(tex-src)
 		<verbose>on:<flags>-verbose
 		<verbose>on:<flags>-diagnostics
 		<flags>-r$(_)"$(latexmkrc[1])"
-		"<doc-stage>final:<flags>-usepretex=\"\\\\def\\\\isofinal{yes}\""
+		<conditional>@latex-defs
+		<relevant>doc-stage
+		<relevant>license
 	;
 explicit ecosystem.pdf ;
 
+rule install-name ( properties * )
+{
+	local name = ecosystem-is ;
+	if <doc-stage>draft in $(properties) { name += draft ; }
+	if <doc-stage>final in $(properties) { name += final ; }
+	if <license>on in $(properties) { name += ccby4 ; }
+	return <name>$(name:J=-).pdf ;
+}
+
 install ecosystem-is
 	:	ecosystem.pdf
 	:	<location>.
-		<doc-stage>draft:<name>ecosystem-is-draft.pdf
-		<doc-stage>final:<name>ecosystem-is-final.pdf
+		<conditional>@install-name
 	;
 
 # Generic latexmk action.

src/eco_cover_reg.tex

@@ -73,8 +73,10 @@
 % 
 \copyright\ ISO/IEC \relyear\\
 
+\ifdefined\license
 Except where otherwise noted, content is licensed under a Creative Commons
 Attribution 4.0 International license (CC BY 4.0).\\
+\fi
 
 \begin{indented}
 \microtypesetup{activate=false}%

src/ecosystem.tex

@@ -99,7 +99,9 @@
 
 %%--------------------------------------------------
 %% chapters
+\ifdefined\license
 \input{eco_license}
+\fi
 \input{eco_scope}
 \input{eco_refs}
 \input{eco_conformance}

src/in_config.tex

@@ -17,7 +17,11 @@
 \newcommand{\doctitlefr}{Norme pour L'écosystème \Cpp{}}
 
 %% Common bits
+\ifdefined\license
 \newcommand{\isocopyright}{\copyright\ ISO/IEC \relyear\ --- CC BY 4.0}
+\else
+\newcommand{\isocopyright}{\copyright\ ISO/IEC \relyear\ --- All rights reserved}
+\fi
 
 %% States
 \newcommand{\isodoctype}{Draft International Standard}