draining just to be sure for CTAN distribution

README.ctan

@@ -0,0 +1,22 @@
+LaTeX-proposal: A set of LaTeX classes for preparing proposals for collaborative projects
+
+The base proposal class supports many of the general elements of project proposals. It is
+optimized towards collaborating on writing project proposals. This class is intended to be
+specialized to particular funding bodies that have their own styles.
+
+MANIFEST: 
+base:  the base proposal class
+dfg:	  the instance for Deutsche Forschungsgemeinschaft
+eu:     the instance for EU proposals
+etc:	  style files from the sTeX bundle added for convenience 
+          (only on GitHub, not on CTAN)
+lib:	  Makefiles for the management of self-documenting packages
+bin:    A script that makes GitHub issues from the deliverables of a
+          proposal for project managment if the proposal is granted. 
+
+Copyright(c) 2010 Michael Kohlhase
+The package is distributed under the terms of the LaTeX Project Public License (LPPL)
+
+The development version of this package can be found at
+https://github.com/KWARC/LaTeX-proposal
+This also contains examples and Makefiles that help the proposal writing process.

dfg/examples/simple-proposal/proposal-blx.bib

@@ -1,5 +1,5 @@
 @Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.5 $}
+@Comment{$ biblatex version 2.6 $}
 Do not modify this file!
 
 This is an auxiliary file used by the 'biblatex' package.
@@ -7,5 +7,5 @@ This file may safely be deleted. It will be recreated as
 required.
 
 @Control{biblatex-control,
-  options = {2.5:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
+  options = {2.6:0:0:1:0:0:1:1:0:1:0:0:12:1:3:1:79:+},
 }

lib/Makefile.ctan

@@ -23,10 +23,16 @@ TMP    	        = /tmp
 #TDSCOLL 	?= $(shell basename $$PWD)
 TDSCOLL 	= proposal
 EXPORTED	= $(TMP)/$(TDSCOLL).exp
-TDSDIR 		= $(TMP)/$(TDSCOLL).tds
+
-TDSZIP 		= $(TMP)/$(TDSCOLL).tds.zip
+TDS.dir             = $(TDSCOLL).tds
+TDSDIR 		= $(TMP)/$(TDS.dir)
+TDS.zip		= $(TDS.dir).zip	
+TDSZIP 		= $(TMP)/$(TDS.zip)
+
 CTANDIR 	= $(TMP)/$(TDSCOLL)
-CTANZIP		= $(TMP)/$(TDSCOLL).ctan.zip
+CTAN.zip	        = $(TDSCOLL).ctan.zip 
+CTANZIP		= $(TMP)/$(CTAN.zip)
+
 MAKE		= make
 
 # this target makes the file CTANZIP by creating and populating the directory 
@@ -35,30 +41,31 @@ MAKE		= make
 # export a clean copy EXPORTED, on which we run the target ctanexp below,  
 # which generates a directory CTANDIR, which we zip and move into place. 
 ctan: all  filedate checksum
-	git commit -am'draining just to be sure for CTAN distribution'
+	git commit -am'draining just to be sure for CTAN distribution' --allow-empty
 	rm -Rf $(EXPORTED)
 	@echo "exporting a clean copy to $(EXPORTED)"
-	cd $(TMP); git clone $(GITREPOS); mv $(REPOSNAME) $(EXPORTED)
+	cd $(TMP);rm -Rf $(REPOSNAME);git clone $(GITREPOS);mv $(REPOSNAME) $(EXPORTED)
 	rm -Rf $(EXPORTED)/.git
-	rm $(EXPORTED)/.gitignore
+	find $(EXPORTED) -name ".gitignore" -delete
 	cd $(EXPORTED);$(MAKE) -$(MAKEFLAGS) ctanext
 	@echo "zipping the result to $(TDSCOLL).ctan.zip"
-	cd $(TMP); zip -r -q $(CTANZIP) $(TDSCOLL); cp $(CTANZIP) $(HERE)
+	cd $(TMP);zip -r $(CTANZIP) $(TDS.zip) $(TDSCOLL);cp $(CTANZIP) $(HERE)
-	rm -Rf $(EXPORTED) $(CTANDIR) $(CTANZIP)
+	@echo "cleaning up"   
+	rm -Rf $(EXPORTED) $(CTANDIR) $(CTANZIP) $(TDSZIP)
+	@echo "disabling checksums again for further development"
+	$(MAKE) -$(MAKEFLAGS) disablechecksum
 
 # this target is run on EXPORTED. It first makes the target tdsext below, 
 # and then copies all necessary stuff into CTANDIR. 
 ctanext: tdsext
-	@echo "making a CTAN compliant archive"
+	@echo "making a CTAN compliant archive in " pwd
 	rm -Rf $(CTANDIR) $(CTANZIP)
 	@echo "  preparing a copy $(CTANDIR) from $(EXPORTED)"
 	mkdir -p $(CTANDIR) 
-	cp $(TDSZIP) $(CTANDIR)
 	@for d in $(DTXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) lctan) done
 	@for d in $(SRCDIRS) $(DOCDIRS); do (cp -R $$d $(CTANDIR)) done; 
-	cp $(TDSZIP) $(CTANDIR)
+	@for d in $(SRCFILES); do (cp -p $$d $(CTANDIR)) done; 
 	cp $(TDS.README) $(CTANDIR)/README
-	rm -Rf  $(TDSZIP)
 
 # this target makes the file TDSZIP by creating and populating the directory 
 # TDSDIR and zipping it. 
@@ -71,10 +78,11 @@ tdsext:
 	@for d in $(DTXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) ltds) done
 	@echo "  copying binary dir to $(TDSDIR)"
 	@for d in $(SRCDIRS); do (cp -R $$d $(TDSDIR)/source/latex/$(TDSCOLL)) done; 
+	@for d in $(SRCFILES); do (cp -R $$d $(TDSDIR)/source/latex/$(TDSCOLL)) done; 
 	@echo "  copying documentation to $(TDSDIR)"
 	@for d in $(DOCDIRS); do (cp -R $$d $(TDSDIR)/doc/latex/$(TDSCOLL)) done; 
 	@for d in $(TDS.doc); do (cp -R $$d $(TDSDIR)/doc/latex/$(TDSCOLL)) done;
 	@echo "zipping the result to $(TDSCOLL).tds.zip"
-	cd $(TDSDIR); zip -r -q $(TDSZIP) .; cd -
+	cd $(TDSDIR);zip -r -q $(TDSZIP) .
 	@echo "and removing the temporary directory $(TDSDIR)"
 	rm -Rf $(TDSDIR)

lib/Makefile.in

@@ -1,13 +1,17 @@
 all: package doc
-
 package: $(DTX.sty) $(DTX.cls)
-
 doc: $(DTX.pdf) $(EXAMPLE.pdf)
 
-$(EXAMPLE.pdf): %.pdf: %.tex $(DTX.sty) $(DTX.cls) $(IMG) $(EXAMPLE.deps) 
+$(DTX.sty) $(DTX.cls): $(INS) $(DTX)
+	$(PDFLATEX) $(INS)
+
+
+$(EXAMPLE.pdf): %.pdf: %.tex $(DTX.sty) $(DTX.cls) $(EXAMPLE.deps) 
 	$(PDFLATEX) $(firstword $<)
 	@if (grep 'Please (re)run Biber' $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
 	    then biber $(patsubst %.dtx, %, $(firstword $<));fi
+	@if (grep 'Please (re)run BibTeX' $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
+	    then bibtex $(patsubst %.dtx, %, $(firstword $<));fi
 	@if (grep "Writing index file" $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
 	   then makeindex\
 		-o $(patsubst %.dtx, %.ind, $(firstword $<))\
@@ -17,14 +21,10 @@ $(EXAMPLE.pdf): %.pdf: %.tex $(DTX.sty) $(DTX.cls) $(IMG) $(EXAMPLE.deps)
 	@if (grep Rerun $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
 	    then $(PDFLATEX) $(firstword $<); fi
 
-sty: $(DTX.sty) 
-ltxml: $(DTX.ltxml) 
-
 %.ind:	
 	touch $@
 
-$(DTX.pdf): %.pdf: %.dtx $(IMG) 
+$(DTX.pdf): %.pdf: %.dtx $(DTX.sty) $(DTX.cls)
-	$(PDFLATEX) $(patsubst %.pdf,%.ins,$@)
 	$(PDFLATEX) $(firstword $<)
 	@if (grep 'Please (re)run Biber' $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
 	    then biber $(patsubst %.dtx, %, $(firstword $<));fi
@@ -41,23 +41,11 @@ $(DTX.pdf): %.pdf: %.dtx $(IMG)
 	@if (grep Rerun $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
 	    then $(PDFLATEX) $(firstword $<); fi
 
-$(DTX.sty): %.sty: %.ins %.dtx 
-	$(PDFLATEX) $<
-
-$(DTX.cls): %.cls: %.ins %.dtx 
-	$(PDFLATEX) $<
-
-$(DTX.sty.ltxml): %.sty.ltxml: %.ins %.dtx 
-	$(PDFLATEX) $<
-
-$(DTX.cls.ltxml): %.cls.ltxml: %.ins %.dtx 
-	$(PDFLATEX) $<
-
 clean:     
 	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg 
 
 distclean: 	clean
-	rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.xml *.omdoc *.thm
+	rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.thm
 	rm -Rf auto	
 
 filedate:
@@ -85,14 +73,18 @@ ltds:
 	rm -Rf $(TDSDIR.doc);mkdir -p $(TDSDIR.doc)
 	rm -Rf $(TDSDIR.tex);mkdir -p $(TDSDIR.tex)
 	rm -Rf $(TDSDIR.src);mkdir -p $(TDSDIR.src)
-	cp $(DTX) $(TDS.src) $(TDSDIR.src)
+	cp $(DTX.src) $(TDS.src) $(TDSDIR.src)
 	cp $(DTX.sty) $(DTX.cls) $(TDS.tex) $(TDSDIR.tex)
-	cp $(DTX.sty.ltxml) $(DTX.cls.ltxml) $(TDSDIR.tex) || echo "omitting ltxml files"
 	cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(TDSDIR.doc)
 	@for d in $(TDS.exdirs); do cp -R $(TDS.exdirs) $(TDSDIR.doc); done
 
 lctan:
 	mkdir -p $(CTANDIR)
-	cp $(DTX) $(TDS.src) $(CTANDIR)
+	cp $(DTX.src) $(TDS.src) $(TDS.tex) $(CTANDIR)
 	cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(CTANDIR)
 	@for d in $(TDS.exdirs); do cp -R $(TDS.exdirs) $(CTANDIR); done
+
+# sometimes (when bibLaTeX changes) we have to rerun biber; use make -B biber
+biber:
+	pdflatex $(DTX.base:%=%.dtx)
+	biber $(DTX.base)

lib/Makefile.vars

@@ -1,12 +1,12 @@
 # DTX.sty.base and DTX.cls.base are set in the including Makefiles
-DTX.base = $(DTX.sty.base) $(DTX.cls.base)
+DTX.base ?= $(DTX.sty.base) $(DTX.cls.base)
-DTX = $(DTX.base:%=%.dtx) $(DTX.base:%=%.ins)
+DTX.src = $(DTX) $(DTX:%.dtx=%.ins)
+INS = $(DTX:%.dtx=%.ins)
 
-DTX.sty.ltxml = $(DTX.sty.base:%=%.sty.ltxml) 
-DTX.cls.ltxml = $(DTX.cls.base:%=%.cls.ltxml)
 DTX.sty = $(DTX.sty.base:%=%.sty)
 DTX.cls = $(DTX.cls.base:%=%.cls)
-DTX.pdf	= $(sort $(DTX.base:%=%.pdf)) # sort to remove duplicates
+DTX.pdf	= $(DTX:%.dtx=%.pdf)
+
 # The examples
 EXAMPLE.pdf	= $(EXAMPLE.base:%=%.pdf)
 EXAMPLE.tex	= $(EXAMPLE.base:%=%.tex)