diff options
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 38 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 7 |
2 files changed, 32 insertions, 13 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index 1f2158a..836a064 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -280,9 +280,6 @@ distclean: clean $$sys_rm -f .local .build - - - # Packaging rules # --------------- # @@ -304,8 +301,12 @@ $(project-package-contents): paper.pdf | $(texdir) echo "paper.pdf: paper.tex paper.bbl" > $$m printf "\tpdflatex -shell-escape -halt-on-error paper\n" >> $$m echo "paper.bbl: tex/src/references.tex" >> $$m + printf "\tcat tex/src/references.tex \\ \b\n" >> $$m + printf "\t tex/build/macros/dependencies-bib.tex \\ \b\n" >> $$m + printf "\t > references.bib\n" >> $$m + printf "\tpdflatex -shell-escape -halt-on-error paper\n" >> $$m + printf "\tbibtex paper\n" >> $$m printf "\tpdflatex -shell-escape -halt-on-error paper\n" >> $$m - printf "\tbiber paper\n" >> $$m echo ".PHONY: clean" >> $$m echo "clean:" >> $$m printf "\trm -f *.aux *.auxlock *.bbl *.bcf\n" >> $$m @@ -344,8 +345,8 @@ $(project-package-contents): paper.pdf | $(texdir) # temporary archive directory that we are now copying to). We will be # using Bash's extended globbing ('extglob') for excluding this # directory. - shopt -s extglob - cp -r tex/build/!($(project-package-name)) $$dir/tex/build + cp -r tex/build/build tex/build/macros tex/build/figures \ + $$dir/tex/build # Clean up the $(texdir)/build* directories in the archive (when # building in a group structure, there will be 'build-user1', @@ -370,10 +371,20 @@ $(project-package-contents): paper.pdf | $(texdir) # same BibLaTeX version to interpret the '.bbl' file. TIP: you can # use the same strategy for other LaTeX packages that may cause # problems on the arXiv server. - cp tex/build/build/paper.bbl $$dir/ - tltopdir=.local/texlive/maneage/texmf-dist/tex/latex - find $$tltopdir/biblatex/ -maxdepth 1 -type f -print0 \ - | xargs -0 cp -t $$dir +# +# NOT NECESSARY FOR BIBTEX +# cp tex/build/build/paper.bbl $$dir/ + +# For BibTex: merge the citations and bring them into the top source +# directory as well as the A&A style files. + cat tex/src/references.tex \ + tex/build/macros/dependencies-bib.tex > $$dir/references.bib + cp tex/src/aa.bst tex/src/aa.cls $$dir/ + +# Commented because arXiv is now using the latest TeXlive. +# tltopdir=.local/texlive/maneage/texmf-dist/tex/latex +# find $$tltopdir/biblatex/ -maxdepth 1 -type f -print0 \ +# | xargs -0 cp -t $$dir # Just in case the package users want to rebuild some of the figures # (manually un-comment the 'makepdf' command we commented above), @@ -382,6 +393,13 @@ $(project-package-contents): paper.pdf | $(texdir) sed -e's|{tikz/}|{tex/tikz/}|' $$pgfsettings > $$pgfsettings.new mv $$pgfsettings.new $$pgfsettings +# Remove all FITS and postscript files from the directory to be +# distributed (they consume a lot of space and are binary!). + cd $(texdir) + find $(project-package-name) -name \*.ps -delete + find $(project-package-name) -name \*.fits -delete + cd $(curdir) + # PROJECT SPECIFIC # ---------------- # Put any project-specific distribution steps here. diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index ecb60de..67ca8b6 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -444,7 +444,6 @@ $(ibidir)/cfitsio-$(cfitsio-version): # # Note that older versions of CFITSIO (before 4.4.0) require a # specific 'shared' target for the building of the shared libraries. - export CFLAGS="-std=gnu17 $$CFLAGS" export gbuild_tar=$(ddir)/$$customtar $(call gbuild, cfitsio-$(cfitsio-version), , \ --enable-sse2 --enable-reentrant \ @@ -1199,8 +1198,8 @@ $(ibidir)/ghostscript-$(ghostscript-version): \ --enable-dynamic \ --disable-compile-inits \ --disable-hidden-visibility \ - LDFLAGS=-Wl,--copy-dt-needed-entries \ - CFLAGS="-DPNG_ARM_NEON_OPT=0 -std=gnu17" + CFLAGS="-DPNG_ARM_NEON_OPT=0" \ + LDFLAGS=-Wl,--copy-dt-needed-entries # Build and install the program and the shared libraries. make V=1 -j$(numthreads) @@ -1230,6 +1229,7 @@ $(ibidir)/gnuastro-$(gnuastro-version): \ $(ibidir)/wcslib-$(wcslib-version) \ $(ibidir)/libjpeg-$(libjpeg-version) \ $(ibidir)/libtiff-$(libtiff-version) \ + $(ibidir)/libgit2-$(libgit2-version) \ $(ibidir)/ghostscript-$(ghostscript-version) tarball=gnuastro-$(gnuastro-version).tar.lz $(call import-source, $(gnuastro-url), $(gnuastro-checksum)) @@ -1865,6 +1865,7 @@ $(ibidir)/zip-$(zip-version): $(ibidir)/gzip-$(gzip-version) # NY on the internet infrastructure). texlive-url=http://mirrors.rit.edu/CTAN/systems/texlive/tlnet $(itidir)/texlive-ready-tlmgr: reproduce/software/config/texlive.conf + tarball=install-tl-unx.tar.gz $(call import-source, $(texlive-url), NO-CHECK-SUM) |