diff options
| author | Troy A. Griffitts <scribe@crosswire.org> | 2022-09-12 21:14:52 +0000 |
|---|---|---|
| committer | Troy A. Griffitts <scribe@crosswire.org> | 2022-09-12 21:14:52 +0000 |
| commit | 94f1d79c517e886d1b1105355317f3e8a5879a73 (patch) | |
| tree | 534706033299ce3d517b6108c77b04080433a78b | |
| parent | 5ab64b03860390a9dd381df9c992d4d1cc992e5c (diff) | |
| download | sword-tools-94f1d79c517e886d1b1105355317f3e8a5879a73.tar.gz | |
cleaned up NASB1995 a bit more
git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@545 07627401-56e2-0310-80f4-f8cd0041bdcd
| -rw-r--r-- | modules/nasb1995/Makefile | 7 | ||||
| -rw-r--r-- | modules/nasb1995/generalchanges.sed | 22 |
2 files changed, 15 insertions, 14 deletions
diff --git a/modules/nasb1995/Makefile b/modules/nasb1995/Makefile index e52a082..46a3efb 100644 --- a/modules/nasb1995/Makefile +++ b/modules/nasb1995/Makefile @@ -1,6 +1,7 @@ #SRC_ZIP_PATH=pristine-private/nasb/historical/nasb.zip SRC_ZIP_PATH=pristine-private/nasb/nasb_1995_full_06-15-21.zip MODNAME=NASB1995 +MODNAMEPREV=NASB MODNAMEPATHSEG=nasb1995 REPO=lockman @@ -36,12 +37,12 @@ src.zip: scp host.crosswire.org:~swordmod/${SRC_ZIP_PATH} src.zip $(MODNAME)_previous.zip: - wget "https://crosswire.org/ftpmirror/pub/sword/lockmanpackages/$(MODNAME).zip" -O $(MODNAME)_previous.zip + wget "https://crosswire.org/ftpmirror/pub/sword/lockmanpackages/$(MODNAMEPREV).zip" -O $(MODNAME)_previous.zip tmp/$(MODNAME)_previous.imp: $(MODNAME)_previous.zip generalchanges.sed cd tmp && rm -rf mods.d modules cd tmp && unzip -uD ../$(MODNAME)_previous.zip - cd tmp && mod2imp $(MODNAME) > $(MODNAME)_previous_raw.imp + cd tmp && mod2imp $(MODNAMEPREV) > $(MODNAME)_previous_raw.imp cd tmp && sed -f ../generalchanges.sed -i $(MODNAME)_previous_raw.imp cd tmp && sed 's/\([^^]\)\(<[^/]\)/\1\n\2/g' $(MODNAME)_previous_raw.imp > $(MODNAME)_previous.imp @@ -62,7 +63,7 @@ clean: rm -rf combined.osis.* *.o lockosis modules $(MODNAME).zip notes.txt src.txt tmp diff lint.err distclean: clean - rm -rf src.zip NASB_previous.zip + rm -rf src.zip $(MODNAME)_previous.zip .cpp: g++ -O0 -g -DHAVESWORD -Wall -Werror `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword` diff --git a/modules/nasb1995/generalchanges.sed b/modules/nasb1995/generalchanges.sed index 4694780..0a267f9 100644 --- a/modules/nasb1995/generalchanges.sed +++ b/modules/nasb1995/generalchanges.sed @@ -1,13 +1,13 @@ #changes since last revision that we don't care about when diff'ing -s/x-PN"/x-Poetry"/g -s/x-PO"/x-Poetry"/g -s/<milestone type="x-Poetry"\/><milestone marker="“" subType="optional" type="cQuote"\/>//g -s/<milestone type="x-Poetry"\/><milestone marker="‘" subType="optional" type="cQuote"\/>//g -s/<milestone type="x-Poetry"\/>“//g -s/<milestone type="x-Poetry"\/>‘//g -s/sID="[^"]*"/sID="sX"/g -s/eID="[^"]*"/eID="eX"/g -s/"strong:H384"/"strong:this"/g -s/"strong:H2088"/"strong:this"/g -s/<hi type="bold">\(.\)<\/hi>/\1/g +#s/x-PN"/x-Poetry"/g +#s/x-PO"/x-Poetry"/g +#s/<milestone type="x-Poetry"\/><milestone marker="“" subType="optional" type="cQuote"\/>//g +#s/<milestone type="x-Poetry"\/><milestone marker="‘" subType="optional" type="cQuote"\/>//g +#s/<milestone type="x-Poetry"\/>“//g +#s/<milestone type="x-Poetry"\/>‘//g +#s/sID="[^"]*"/sID="sX"/g +#s/eID="[^"]*"/eID="eX"/g +#s/"strong:H384"/"strong:this"/g +#s/"strong:H2088"/"strong:this"/g +#s/<hi type="bold">\(.\)<\/hi>/\1/g |