Merge branch 'bwipp:master' into optimal-maxicode

bwipp · Nov 6, 2024 · e4908aa · e4908aa
2 parents d8461ff + 41f93c4
commit e4908aa
Show file tree

Hide file tree

Showing 124 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
-src/*.d
+src/*.ps.d
 build/monolithic/
 build/monolithic_package/
 build/packaged_resource/
 build/resource/
 build/release/
 build/standalone/
 build/standalone_package/
-.travis/GITHUBTOKEN
 libs/docs/html/
diff --git a/Makefile b/Makefile
@@ -12,10 +12,11 @@ DSTDIR = build
 CHANGES_FILE=CHANGES
 VERSION:=$(shell head -n 1 $(CHANGES_FILE))
 
-SOURCES:=$(wildcard $(SRCDIR)/*.ps)
+SOURCES:=$(wildcard $(SRCDIR)/*.ps.src)
+
 DOCNAMES:=$(notdir $(wildcard $(DOCDIR)/*))
 
-TARGETS:=$(basename $(notdir $(SOURCES)))
+TARGETS:=$(notdir $(SOURCES:.ps.src=))
 TARGETS:=$(filter-out preamble, $(TARGETS))
 
 UPR_FILE = $(SRCDIR)/uk.co.terryburton.bwipp.upr
@@ -124,12 +125,12 @@ clean:
 test: all
 	tests/run_tests
 
-$(SRCDIR)/%.d: $(SRCDIR)/%.ps $(UPR_FILE)
+$(SRCDIR)/%.ps.d: $(SRCDIR)/%.ps.src $(UPR_FILE)
 	$(DSTDIR)/make_deps.pl $< $(addsuffix /Resource,$(RESDIR) $(PACKAGEDIR)) >$@
-cleanlist += ${SOURCES:.ps=.d}
+cleanlist += ${SOURCES:.ps.src=.ps.d}
 
 ifneq "$(MAKECMDGOALS)" "clean"
--include ${SOURCES:.ps=.d}
+-include ${SOURCES:.ps.src=.ps.d}
 endif
 
 #------------------------------------------------------------
@@ -140,10 +141,10 @@ $(RESMKDIRSTAMP):
 	mkdir -p $(RESMKDIRS)
 	touch $@
 
-$(RESDIR)/Resource/uk.co.terryburton.bwipp/%: $(SRCDIR)/%.ps $(SRCDIR)/ps.head $(CHANGES_FILE) $(RESMKDIRSTAMP)
+$(RESDIR)/Resource/uk.co.terryburton.bwipp/%: $(SRCDIR)/%.ps.src $(SRCDIR)/ps.head $(CHANGES_FILE) $(RESMKDIRSTAMP)
 	$(DSTDIR)/make_resource.pl $< $@
 
-$(RESDIR)/Resource/Category/uk.co.terryburton.bwipp: $(SRCDIR)/preamble.ps $(SRCDIR)/ps.head $(CHANGES_FILE) $(RESMKDIRSTAMP)
+$(RESDIR)/Resource/Category/uk.co.terryburton.bwipp: $(SRCDIR)/preamble.ps.src $(SRCDIR)/ps.head $(CHANGES_FILE) $(RESMKDIRSTAMP)
 	$(DSTDIR)/make_resource.pl $< $@
 
 $(RESDIR)/Resource/uk.co.terryburton.bwipp.upr: $(UPR_FILE) $(RESMKDIRSTAMP)
@@ -167,10 +168,10 @@ $(PACKAGEMKDIRSTAMP):
 	mkdir -p $(PACKAGEMKDIRS)
 	touch $@
 
-$(PACKAGEDIR)/Resource/uk.co.terryburton.bwipp/%: $(SRCDIR)/%.ps $(SRCDIR)/ps.head $(CHANGES_FILE) $(PACKAGEMKDIRSTAMP)
+$(PACKAGEDIR)/Resource/uk.co.terryburton.bwipp/%: $(SRCDIR)/%.ps.src $(SRCDIR)/ps.head $(CHANGES_FILE) $(PACKAGEMKDIRSTAMP)
 	$(DSTDIR)/make_resource.pl $< $@
 
-$(PACKAGEDIR)/Resource/Category/uk.co.terryburton.bwipp: $(SRCDIR)/preamble.ps $(SRCDIR)/ps.head $(CHANGES_FILE) $(PACKAGEMKDIRSTAMP)
+$(PACKAGEDIR)/Resource/Category/uk.co.terryburton.bwipp: $(SRCDIR)/preamble.ps.src $(SRCDIR)/ps.head $(CHANGES_FILE) $(PACKAGEMKDIRSTAMP)
 	$(DSTDIR)/make_resource.pl $< $@
 
 $(PACKAGEDIR)/Resource/uk.co.terryburton.bwipp.upr: $(UPR_FILE) $(PACKAGEMKDIRSTAMP)
@@ -234,7 +235,7 @@ $(STANDALONE_MKDIRSTAMP):
 	mkdir -p $(STANDALONE_MKDIRS)
 	touch $@
 
-$(STANDALONE_DIR)/%.ps: $(MONOLITHIC_FILE) $(SRCDIR)/%.ps $(SRCDIR)/ps.head $(CHANGES_FILE) $(STANDALONE_MKDIRSTAMP)
+$(STANDALONE_DIR)/%.ps: $(MONOLITHIC_FILE) $(SRCDIR)/%.ps.src $(SRCDIR)/ps.head $(CHANGES_FILE) $(STANDALONE_MKDIRSTAMP)
 	$(DSTDIR)/make_standalone.pl $< $@
 
 #------------------------------------------------------------
@@ -243,7 +244,7 @@ $(STANDALONE_PACKAGE_MKDIRSTAMP):
 	mkdir -p $(STANDALONE_PACKAGE_MKDIRS)
 	touch $@
 
-$(STANDALONE_PACKAGE_DIR)/%.ps: $(MONOLITHIC_PACKAGE_FILE) $(SRCDIR)/%.ps $(SRCDIR)/ps.head $(CHANGES_FILE) $(STANDALONE_PACKAGE_MKDIRSTAMP)
+$(STANDALONE_PACKAGE_DIR)/%.ps: $(MONOLITHIC_PACKAGE_FILE) $(SRCDIR)/%.ps.src $(SRCDIR)/ps.head $(CHANGES_FILE) $(STANDALONE_PACKAGE_MKDIRSTAMP)
 	$(DSTDIR)/make_standalone.pl $< $@
 
 #------------------------------------------------------------

diff --git a/build/make_monolithic.pl b/build/make_monolithic.pl
@@ -27,8 +27,8 @@
 
 while ($upr =~ /^(.*)=(.*)$/mg) {
 
-  my $srcfile = "src/$1.ps";
-  $srcfile = 'src/preamble.ps' if $1 eq 'uk.co.terryburton.bwipp';
+  my $srcfile = "src/$1.ps.src";
+  $srcfile = 'src/preamble.ps.src' if $1 eq 'uk.co.terryburton.bwipp';
   my $resfile = "$resourcedir/$2";
 
   open($fh, '<', $srcfile) || die "Unable to open source file: $srcfile";

diff --git a/src/auspost.ps → src/auspost.ps.src b/src/auspost.ps → src/auspost.ps.src
diff --git a/src/azteccode.ps → src/azteccode.ps.src b/src/azteccode.ps → src/azteccode.ps.src
diff --git a/src/azteccodecompact.ps → src/azteccodecompact.ps.src b/src/azteccodecompact.ps → src/azteccodecompact.ps.src
diff --git a/src/aztecrune.ps → src/aztecrune.ps.src b/src/aztecrune.ps → src/aztecrune.ps.src
diff --git a/src/bc412.ps → src/bc412.ps.src b/src/bc412.ps → src/bc412.ps.src
diff --git a/src/channelcode.ps → src/channelcode.ps.src b/src/channelcode.ps → src/channelcode.ps.src
diff --git a/src/codablockf.ps → src/codablockf.ps.src b/src/codablockf.ps → src/codablockf.ps.src
diff --git a/src/code11.ps → src/code11.ps.src b/src/code11.ps → src/code11.ps.src
diff --git a/src/code128.ps → src/code128.ps.src b/src/code128.ps → src/code128.ps.src
diff --git a/src/code16k.ps → src/code16k.ps.src b/src/code16k.ps → src/code16k.ps.src
diff --git a/src/code2of5.ps → src/code2of5.ps.src b/src/code2of5.ps → src/code2of5.ps.src
diff --git a/src/code32.ps → src/code32.ps.src b/src/code32.ps → src/code32.ps.src
diff --git a/src/code39.ps → src/code39.ps.src b/src/code39.ps → src/code39.ps.src
diff --git a/src/code39ext.ps → src/code39ext.ps.src b/src/code39ext.ps → src/code39ext.ps.src
diff --git a/src/code49.ps → src/code49.ps.src b/src/code49.ps → src/code49.ps.src
diff --git a/src/code93.ps → src/code93.ps.src b/src/code93.ps → src/code93.ps.src
diff --git a/src/code93ext.ps → src/code93ext.ps.src b/src/code93ext.ps → src/code93ext.ps.src
diff --git a/src/codeone.ps → src/codeone.ps.src b/src/codeone.ps → src/codeone.ps.src
diff --git a/src/coop2of5.ps → src/coop2of5.ps.src b/src/coop2of5.ps → src/coop2of5.ps.src
diff --git a/src/daft.ps → src/daft.ps.src b/src/daft.ps → src/daft.ps.src
diff --git a/src/databarexpanded.ps → src/databarexpanded.ps.src b/src/databarexpanded.ps → src/databarexpanded.ps.src
diff --git a/src/databarexpandedcomposite.ps → src/databarexpandedcomposite.ps.src b/src/databarexpandedcomposite.ps → src/databarexpandedcomposite.ps.src
diff --git a/src/databarexpandedstacked.ps → src/databarexpandedstacked.ps.src b/src/databarexpandedstacked.ps → src/databarexpandedstacked.ps.src
diff --git a/src/databarexpandedstackedcomposite.ps → src/databarexpandedstackedcomposite.ps.src b/src/databarexpandedstackedcomposite.ps → src/databarexpandedstackedcomposite.ps.src
diff --git a/src/databarlimited.ps → src/databarlimited.ps.src b/src/databarlimited.ps → src/databarlimited.ps.src
diff --git a/src/databarlimitedcomposite.ps → src/databarlimitedcomposite.ps.src b/src/databarlimitedcomposite.ps → src/databarlimitedcomposite.ps.src
diff --git a/src/databaromni.ps → src/databaromni.ps.src b/src/databaromni.ps → src/databaromni.ps.src
diff --git a/src/databaromnicomposite.ps → src/databaromnicomposite.ps.src b/src/databaromnicomposite.ps → src/databaromnicomposite.ps.src
diff --git a/src/databarstacked.ps → src/databarstacked.ps.src b/src/databarstacked.ps → src/databarstacked.ps.src
diff --git a/src/databarstackedcomposite.ps → src/databarstackedcomposite.ps.src b/src/databarstackedcomposite.ps → src/databarstackedcomposite.ps.src
diff --git a/src/databarstackedomni.ps → src/databarstackedomni.ps.src b/src/databarstackedomni.ps → src/databarstackedomni.ps.src
diff --git a/src/databarstackedomnicomposite.ps → src/databarstackedomnicomposite.ps.src b/src/databarstackedomnicomposite.ps → src/databarstackedomnicomposite.ps.src
diff --git a/src/databartruncated.ps → src/databartruncated.ps.src b/src/databartruncated.ps → src/databartruncated.ps.src
diff --git a/src/databartruncatedcomposite.ps → src/databartruncatedcomposite.ps.src b/src/databartruncatedcomposite.ps → src/databartruncatedcomposite.ps.src
diff --git a/src/datalogic2of5.ps → src/datalogic2of5.ps.src b/src/datalogic2of5.ps → src/datalogic2of5.ps.src
diff --git a/src/datamatrix.ps → src/datamatrix.ps.src b/src/datamatrix.ps → src/datamatrix.ps.src
diff --git a/src/datamatrixrectangular.ps → src/datamatrixrectangular.ps.src b/src/datamatrixrectangular.ps → src/datamatrixrectangular.ps.src
diff --git a/src/datamatrixrectangularextension.ps → src/datamatrixrectangularextension.ps.src b/src/datamatrixrectangularextension.ps → src/datamatrixrectangularextension.ps.src
diff --git a/src/dotcode.ps → src/dotcode.ps.src b/src/dotcode.ps → src/dotcode.ps.src
diff --git a/src/ean13.ps → src/ean13.ps.src b/src/ean13.ps → src/ean13.ps.src
diff --git a/src/ean13composite.ps → src/ean13composite.ps.src b/src/ean13composite.ps → src/ean13composite.ps.src
diff --git a/src/ean14.ps → src/ean14.ps.src b/src/ean14.ps → src/ean14.ps.src
diff --git a/src/ean2.ps → src/ean2.ps.src b/src/ean2.ps → src/ean2.ps.src
diff --git a/src/ean5.ps → src/ean5.ps.src b/src/ean5.ps → src/ean5.ps.src
diff --git a/src/ean8.ps → src/ean8.ps.src b/src/ean8.ps → src/ean8.ps.src
diff --git a/src/ean8composite.ps → src/ean8composite.ps.src b/src/ean8composite.ps → src/ean8composite.ps.src
diff --git a/src/flattermarken.ps → src/flattermarken.ps.src b/src/flattermarken.ps → src/flattermarken.ps.src
diff --git a/src/gs1-128.ps → src/gs1-128.ps.src b/src/gs1-128.ps → src/gs1-128.ps.src
diff --git a/src/gs1-128composite.ps → src/gs1-128composite.ps.src b/src/gs1-128composite.ps → src/gs1-128composite.ps.src
diff --git a/src/gs1-cc.ps → src/gs1-cc.ps.src b/src/gs1-cc.ps → src/gs1-cc.ps.src
diff --git a/src/gs1datamatrix.ps → src/gs1datamatrix.ps.src b/src/gs1datamatrix.ps → src/gs1datamatrix.ps.src
diff --git a/src/gs1datamatrixrectangular.ps → src/gs1datamatrixrectangular.ps.src b/src/gs1datamatrixrectangular.ps → src/gs1datamatrixrectangular.ps.src
diff --git a/src/gs1dldatamatrix.ps → src/gs1dldatamatrix.ps.src b/src/gs1dldatamatrix.ps → src/gs1dldatamatrix.ps.src
diff --git a/src/gs1dlqrcode.ps → src/gs1dlqrcode.ps.src b/src/gs1dlqrcode.ps → src/gs1dlqrcode.ps.src
diff --git a/src/gs1dotcode.ps → src/gs1dotcode.ps.src b/src/gs1dotcode.ps → src/gs1dotcode.ps.src
diff --git a/src/gs1northamericancoupon.ps → src/gs1northamericancoupon.ps.src b/src/gs1northamericancoupon.ps → src/gs1northamericancoupon.ps.src
diff --git a/src/gs1process.ps → src/gs1process.ps.src b/src/gs1process.ps → src/gs1process.ps.src
diff --git a/src/gs1qrcode.ps → src/gs1qrcode.ps.src b/src/gs1qrcode.ps → src/gs1qrcode.ps.src
diff --git a/src/hanxin.ps → src/hanxin.ps.src b/src/hanxin.ps → src/hanxin.ps.src
diff --git a/src/hibcazteccode.ps → src/hibcazteccode.ps.src b/src/hibcazteccode.ps → src/hibcazteccode.ps.src
diff --git a/src/hibccodablockf.ps → src/hibccodablockf.ps.src b/src/hibccodablockf.ps → src/hibccodablockf.ps.src
diff --git a/src/hibccode128.ps → src/hibccode128.ps.src b/src/hibccode128.ps → src/hibccode128.ps.src
diff --git a/src/hibccode39.ps → src/hibccode39.ps.src b/src/hibccode39.ps → src/hibccode39.ps.src
diff --git a/src/hibcdatamatrix.ps → src/hibcdatamatrix.ps.src b/src/hibcdatamatrix.ps → src/hibcdatamatrix.ps.src
diff --git a/src/hibcdatamatrixrectangular.ps → src/hibcdatamatrixrectangular.ps.src b/src/hibcdatamatrixrectangular.ps → src/hibcdatamatrixrectangular.ps.src
diff --git a/src/hibcmicropdf417.ps → src/hibcmicropdf417.ps.src b/src/hibcmicropdf417.ps → src/hibcmicropdf417.ps.src
diff --git a/src/hibcpdf417.ps → src/hibcpdf417.ps.src b/src/hibcpdf417.ps → src/hibcpdf417.ps.src
diff --git a/src/hibcqrcode.ps → src/hibcqrcode.ps.src b/src/hibcqrcode.ps → src/hibcqrcode.ps.src
diff --git a/src/iata2of5.ps → src/iata2of5.ps.src b/src/iata2of5.ps → src/iata2of5.ps.src
diff --git a/src/identcode.ps → src/identcode.ps.src b/src/identcode.ps → src/identcode.ps.src
diff --git a/src/industrial2of5.ps → src/industrial2of5.ps.src b/src/industrial2of5.ps → src/industrial2of5.ps.src
diff --git a/src/interleaved2of5.ps → src/interleaved2of5.ps.src b/src/interleaved2of5.ps → src/interleaved2of5.ps.src
diff --git a/src/isbn.ps → src/isbn.ps.src b/src/isbn.ps → src/isbn.ps.src
diff --git a/src/ismn.ps → src/ismn.ps.src b/src/ismn.ps → src/ismn.ps.src
diff --git a/src/issn.ps → src/issn.ps.src b/src/issn.ps → src/issn.ps.src
diff --git a/src/itf14.ps → src/itf14.ps.src b/src/itf14.ps → src/itf14.ps.src
diff --git a/src/jabcode.ps → src/jabcode.ps.src b/src/jabcode.ps → src/jabcode.ps.src
diff --git a/src/japanpost.ps → src/japanpost.ps.src b/src/japanpost.ps → src/japanpost.ps.src
diff --git a/src/kix.ps → src/kix.ps.src b/src/kix.ps → src/kix.ps.src
diff --git a/src/leitcode.ps → src/leitcode.ps.src b/src/leitcode.ps → src/leitcode.ps.src
diff --git a/src/loadctx.ps → src/loadctx.ps.src b/src/loadctx.ps → src/loadctx.ps.src
diff --git a/src/mailmark.ps → src/mailmark.ps.src b/src/mailmark.ps → src/mailmark.ps.src
diff --git a/src/mands.ps → src/mands.ps.src b/src/mands.ps → src/mands.ps.src
diff --git a/src/matrix2of5.ps → src/matrix2of5.ps.src b/src/matrix2of5.ps → src/matrix2of5.ps.src
diff --git a/src/maxicode.ps → src/maxicode.ps.src b/src/maxicode.ps → src/maxicode.ps.src
diff --git a/src/micropdf417.ps → src/micropdf417.ps.src b/src/micropdf417.ps → src/micropdf417.ps.src
diff --git a/src/microqrcode.ps → src/microqrcode.ps.src b/src/microqrcode.ps → src/microqrcode.ps.src
diff --git a/src/msi.ps → src/msi.ps.src b/src/msi.ps → src/msi.ps.src
diff --git a/src/onecode.ps → src/onecode.ps.src b/src/onecode.ps → src/onecode.ps.src
diff --git a/src/parseinput.ps → src/parseinput.ps.src b/src/parseinput.ps → src/parseinput.ps.src
diff --git a/src/pdf417.ps → src/pdf417.ps.src b/src/pdf417.ps → src/pdf417.ps.src
diff --git a/src/pdf417compact.ps → src/pdf417compact.ps.src b/src/pdf417compact.ps → src/pdf417compact.ps.src
diff --git a/src/pharmacode.ps → src/pharmacode.ps.src b/src/pharmacode.ps → src/pharmacode.ps.src
diff --git a/src/pharmacode2.ps → src/pharmacode2.ps.src b/src/pharmacode2.ps → src/pharmacode2.ps.src
diff --git a/src/planet.ps → src/planet.ps.src b/src/planet.ps → src/planet.ps.src
diff --git a/src/plessey.ps → src/plessey.ps.src b/src/plessey.ps → src/plessey.ps.src
diff --git a/src/posicode.ps → src/posicode.ps.src b/src/posicode.ps → src/posicode.ps.src
diff --git a/src/postnet.ps → src/postnet.ps.src b/src/postnet.ps → src/postnet.ps.src
diff --git a/src/preamble.ps → src/preamble.ps.src b/src/preamble.ps → src/preamble.ps.src
diff --git a/src/processoptions.ps → src/processoptions.ps.src b/src/processoptions.ps → src/processoptions.ps.src
diff --git a/src/pzn.ps → src/pzn.ps.src b/src/pzn.ps → src/pzn.ps.src
diff --git a/src/qrcode.ps → src/qrcode.ps.src b/src/qrcode.ps → src/qrcode.ps.src
diff --git a/src/raiseerror.ps → src/raiseerror.ps.src b/src/raiseerror.ps → src/raiseerror.ps.src
diff --git a/src/rationalizedCodabar.ps → src/rationalizedCodabar.ps.src b/src/rationalizedCodabar.ps → src/rationalizedCodabar.ps.src
diff --git a/src/raw.ps → src/raw.ps.src b/src/raw.ps → src/raw.ps.src
diff --git a/src/rectangularmicroqrcode.ps → src/rectangularmicroqrcode.ps.src b/src/rectangularmicroqrcode.ps → src/rectangularmicroqrcode.ps.src
diff --git a/src/renlinear.ps → src/renlinear.ps.src b/src/renlinear.ps → src/renlinear.ps.src
diff --git a/src/renmatrix.ps → src/renmatrix.ps.src b/src/renmatrix.ps → src/renmatrix.ps.src
diff --git a/src/renmaximatrix.ps → src/renmaximatrix.ps.src b/src/renmaximatrix.ps → src/renmaximatrix.ps.src
diff --git a/src/royalmail.ps → src/royalmail.ps.src b/src/royalmail.ps → src/royalmail.ps.src
diff --git a/src/sscc18.ps → src/sscc18.ps.src b/src/sscc18.ps → src/sscc18.ps.src
diff --git a/src/swissqrcode.ps → src/swissqrcode.ps.src b/src/swissqrcode.ps → src/swissqrcode.ps.src
diff --git a/src/symbol.ps → src/symbol.ps.src b/src/symbol.ps → src/symbol.ps.src
diff --git a/src/telepen.ps → src/telepen.ps.src b/src/telepen.ps → src/telepen.ps.src
diff --git a/src/telepennumeric.ps → src/telepennumeric.ps.src b/src/telepennumeric.ps → src/telepennumeric.ps.src
diff --git a/src/ultracode.ps → src/ultracode.ps.src b/src/ultracode.ps → src/ultracode.ps.src
diff --git a/src/unloadctx.ps → src/unloadctx.ps.src b/src/unloadctx.ps → src/unloadctx.ps.src
diff --git a/src/upca.ps → src/upca.ps.src b/src/upca.ps → src/upca.ps.src
diff --git a/src/upcacomposite.ps → src/upcacomposite.ps.src b/src/upcacomposite.ps → src/upcacomposite.ps.src
diff --git a/src/upce.ps → src/upce.ps.src b/src/upce.ps → src/upce.ps.src
diff --git a/src/upcecomposite.ps → src/upcecomposite.ps.src b/src/upcecomposite.ps → src/upcecomposite.ps.src