Fix release zipping

zepinglee · Mar 6, 2020 · 17bd251 · 17bd251
1 parent 4d954f6
commit 17bd251
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 90 deletions.
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ doc : $(NAME).pdf
 
 %.sty %-numerical.bst %-author-year.bst : %.ins %.dtx
 	xetex $(TEXOPTS) $<
+	xetex $(TEXOPTS) variants/gbt7714-variants.ins
 
 $(NAME).pdf : $(NAME).dtx FORCE_MAKE
 	$(LATEXMK) $<
@@ -46,5 +47,8 @@ cleanall :
 install :
 	l3build install
 
-ctan :
-	l3build ctan
+ctan : test doc
+	ln -sf . $(NAME)
+	zip -r ../$(NAME).zip $(NAME)/{README.md,LICENSE,$(NAME).dtx,$(NAME).ins,\
+	$(NAME).pdf,$(NAME).sty,$(NAME)-author-year.bst,$(NAME)-numerical.bst}
+	rm $(NAME)
diff --git a/build.lua b/build.lua
@@ -6,12 +6,9 @@ testfiledir = "./test/testfiles"
 testsuppdir = testfiledir .. "/support"
 
 installfiles = {"*.sty", "*.bst"}
-sourcefiles = {"*.dtx"}
-tagfiles = {"*.dtx", "*.ins", "CHANGELOG.md"}
+tagfiles = {"*.dtx", "*.ins", "CHANGELOG.md", "variants/*.ins"}
 textfiles = {"*.md", "LICENSE"}
 
-unpackfiles = {"*.dtx"}
-
 checkengines = {"xetex"}
 stdengine = "xetex"
 

diff --git a/gbt7714.dtx b/gbt7714.dtx
@@ -12,58 +12,15 @@
 % and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 %
-%<*internal>
-\iffalse
-\fi
-\begingroup
-  \def\nameoflatex{LaTeX2e}
-\expandafter\endgroup\ifx\nameoflatex\fmtname\else
-\csname fi\endcsname
-%</internal>
-%<*install>
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
--------------------------------------------------------------------
-GB/T 7714-2015 BibTeX Style
-https://github.com/CTeX-org/gbt7714-bibtex-style
-Version: 2020/03/04 v2.0
--------------------------------------------------------------------
-Copyright (C) 2016-\the\year by Zeping Lee <zepinglee AT gmail.com>
--------------------------------------------------------------------
-This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
-of this license or (at your option) any later version.
-The latest version of this license is in
-   https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
--------------------------------------------------------------------
-\endpreamble
-\nopostamble
-\generate{
-  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-  \file{\jobname-numerical.bst}{\from{\jobname.dtx}{2015,numerical}}
-  \file{\jobname-author-year.bst}{\from{\jobname.dtx}{2015,authoryear}}
-}
-\endbatchfile
-%</install>
-%<*internal>
-\fi
-%</internal>
-%<*driver>
-\ProvidesFile{\jobname.dtx}
-%</driver>
+% \fi
+%
+% \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{gbt7714}
-%<*package>
-  [2020/03/04 v2.0 GB/T 7714-2015 BibTeX Style]
-%</package>
+%<package>  [2020/03/04 v2.0 GB/T 7714-2015 BibTeX Style]
 %
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
-\usepackage[paper=a4paper,margin=1in,left=1.25in]{geometry}
 \usepackage{hypdoc}
 \usepackage[UTF8]{ctex}
 \usepackage{caption}
@@ -119,7 +76,7 @@ version 2005/12/01 or later.
 %
 %
 %
-% \GetFileInfo{\jobname.dtx}
+% \GetFileInfo{gbt7714.sty}
 %
 % \title{GB/T 7714-2015 \BibTeX{} style}
 % \author{Zeping Lee\thanks{zepinglee AT gmail.com}}

diff --git a/gbt7714.ins b/gbt7714.ins
@@ -20,32 +20,8 @@ version 2005/12/01 or later.
 \endpreamble
 \nopostamble
 \generate{
-  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-  \file{\jobname-numerical.bst}{\from{\jobname.dtx}{2015,numerical}}
-  \file{\jobname-author-year.bst}{\from{\jobname.dtx}{2015,authoryear}}
-  \file{versions/2005/\jobname-2005-numerical.bst}{
-    \from{\jobname.dtx}{2005,numerical}
-  }
-  \file{versions/2005/\jobname-2005-author-year.bst}{
-    \from{\jobname.dtx}{2005,authoryear}
-  }
-  \file{versions/thu/thuthesis-numeric.bst}{
-    \from{\jobname.dtx}{thu,2005,numerical}
-  }
-  \file{versions/thu/thuthesis-author-year.bst}{
-    \from{\jobname.dtx}{thu,2005,authoryear}
-  }
-  \file{versions/thu/thuthesis-bachelor.bst}{
-    \from{\jobname.dtx}{2015,numerical,noslsn}
-  }
-  \file{versions/ustc/ustcthesis-authoryear.bst}{
-    \from{\jobname.dtx}{ustc,2015,authoryear}
-  }
-  \file{versions/ustc/ustcthesis-numerical.bst}{
-    \from{\jobname.dtx}{ustc,2015,numerical}
-  }
-  \file{versions/ustc/ustcthesis-bachelor.bst}{
-    \from{\jobname.dtx}{ustc,2015,numerical,nouppercase,nomark,italicjournal}
-  }
+  \file{gbt7714.sty}{\from{gbt7714.dtx}{package}}
+  \file{gbt7714-numerical.bst}{\from{gbt7714.dtx}{2015,numerical}}
+  \file{gbt7714-author-year.bst}{\from{gbt7714.dtx}{2015,authoryear}}
 }
 \endbatchfile
diff --git a/test/check.sh b/test/check.sh
@@ -42,7 +42,6 @@ for file in $testfiledir/*.dtx; do
     if ! diff -q "$bblfile" "$stdfile"; then
         echo "fails";
         succuss=false;
-        cp -f "$bblfile" "$stdfile";
     fi
 done
 

diff --git a/versions/2005/gbt7714-2005-author-year.bst → variants/2005/gbt7714-2005-author-year.bst b/versions/2005/gbt7714-2005-author-year.bst → variants/2005/gbt7714-2005-author-year.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/2005/gbt7714-2005-author-year.bst',
+%% This is file `variants/2005/gbt7714-2005-author-year.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/versions/2005/gbt7714-2005-numerical.bst → variants/2005/gbt7714-2005-numerical.bst b/versions/2005/gbt7714-2005-numerical.bst → variants/2005/gbt7714-2005-numerical.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/2005/gbt7714-2005-numerical.bst',
+%% This is file `variants/2005/gbt7714-2005-numerical.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/variants/gbt7714-variants.ins b/variants/gbt7714-variants.ins
@@ -0,0 +1,48 @@
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+-------------------------------------------------------------------
+GB/T 7714-2015 BibTeX Style
+https://github.com/CTeX-org/gbt7714-bibtex-style
+Version: 2020/03/04 v2.0
+-------------------------------------------------------------------
+Copyright (C) 2016-\the\year by Zeping Lee <zepinglee AT gmail.com>
+-------------------------------------------------------------------
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+The latest version of this license is in
+   https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+-------------------------------------------------------------------
+\endpreamble
+\nopostamble
+\generate{
+  \file{variants/2005/gbt7714-2005-numerical.bst}{
+    \from{gbt7714.dtx}{2005,numerical}
+  }
+  \file{variants/2005/gbt7714-2005-author-year.bst}{
+    \from{gbt7714.dtx}{2005,authoryear}
+  }
+  \file{variants/thu/thuthesis-numeric.bst}{
+    \from{gbt7714.dtx}{thu,2005,numerical}
+  }
+  \file{variants/thu/thuthesis-author-year.bst}{
+    \from{gbt7714.dtx}{thu,2005,authoryear}
+  }
+  \file{variants/thu/thuthesis-bachelor.bst}{
+    \from{gbt7714.dtx}{2015,numerical,noslsn}
+  }
+  \file{variants/ustc/ustcthesis-authoryear.bst}{
+    \from{gbt7714.dtx}{ustc,2015,authoryear}
+  }
+  \file{variants/ustc/ustcthesis-numerical.bst}{
+    \from{gbt7714.dtx}{ustc,2015,numerical}
+  }
+  \file{variants/ustc/ustcthesis-bachelor.bst}{
+    \from{gbt7714.dtx}{ustc,2015,numerical,nouppercase,nomark,italicjournal}
+  }
+}
+\endbatchfile
diff --git a/versions/thu/thuthesis-author-year.bst → variants/thu/thuthesis-author-year.bst b/versions/thu/thuthesis-author-year.bst → variants/thu/thuthesis-author-year.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/thu/thuthesis-author-year.bst',
+%% This is file `variants/thu/thuthesis-author-year.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/versions/thu/thuthesis-bachelor.bst → variants/thu/thuthesis-bachelor.bst b/versions/thu/thuthesis-bachelor.bst → variants/thu/thuthesis-bachelor.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/thu/thuthesis-bachelor.bst',
+%% This is file `variants/thu/thuthesis-bachelor.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/versions/thu/thuthesis-numeric.bst → variants/thu/thuthesis-numeric.bst b/versions/thu/thuthesis-numeric.bst → variants/thu/thuthesis-numeric.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/thu/thuthesis-numeric.bst',
+%% This is file `variants/thu/thuthesis-numeric.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/versions/ustc/ustcthesis-authoryear.bst → variants/ustc/ustcthesis-authoryear.bst b/versions/ustc/ustcthesis-authoryear.bst → variants/ustc/ustcthesis-authoryear.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/ustc/ustcthesis-authoryear.bst',
+%% This is file `variants/ustc/ustcthesis-authoryear.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/versions/ustc/ustcthesis-bachelor.bst → variants/ustc/ustcthesis-bachelor.bst b/versions/ustc/ustcthesis-bachelor.bst → variants/ustc/ustcthesis-bachelor.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/ustc/ustcthesis-bachelor.bst',
+%% This is file `variants/ustc/ustcthesis-bachelor.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:

diff --git a/versions/ustc/ustcthesis-numerical.bst → variants/ustc/ustcthesis-numerical.bst b/versions/ustc/ustcthesis-numerical.bst → variants/ustc/ustcthesis-numerical.bst
@@ -1,5 +1,5 @@
 %%
-%% This is file `versions/ustc/ustcthesis-numerical.bst',
+%% This is file `variants/ustc/ustcthesis-numerical.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were: