diff options
| author | Troy A. Griffitts <scribe@crosswire.org> | 2022-09-10 09:47:55 +0000 |
|---|---|---|
| committer | Troy A. Griffitts <scribe@crosswire.org> | 2022-09-10 09:47:55 +0000 |
| commit | 0fb84c645eab4f21d9d5237953f7377c51168e39 (patch) | |
| tree | 7a35e37735aaf3eab26a67a27b43b567ff36214f | |
| parent | d551d489007dc7ef8ffade5b2bbb205421cc7bc9 (diff) | |
| download | sword-tools-0fb84c645eab4f21d9d5237953f7377c51168e39.tar.gz | |
Generalized NASB95 conversion a bit in preparation of NASB2020
git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@543 07627401-56e2-0310-80f4-f8cd0041bdcd
| -rw-r--r-- | modules/nasb/Makefile | 32 | ||||
| -rw-r--r-- | modules/nasb95/Makefile | 42 | ||||
| -rw-r--r-- | modules/nasb95/lockosis.cpp (renamed from modules/nasb/lockosis.cpp) | 0 | ||||
| -rw-r--r-- | modules/nasb95/mods.d/nasb.conf (renamed from modules/nasb/mods.d/nasb.conf) | 0 |
4 files changed, 42 insertions, 32 deletions
diff --git a/modules/nasb/Makefile b/modules/nasb/Makefile deleted file mode 100644 index 9b26771..0000000 --- a/modules/nasb/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -all: NASB.zip - -NASB.zip: modules/texts/ztext/nasb/ot.bzv - zip -r NASB.zip mods.d modules - -modules/texts/ztext/nasb/ot.bzv: nasb.osis.xml - mkdir -p modules/texts/ztext/nasb - osis2mod modules/texts/ztext/nasb/ nasb.osis.xml -z z -b 4 - chmod a+r modules/texts/ztext/nasb/* - -nasb.osis.xml: nasb.txt lockosis - ./lockosis nasb.txt nasb_ref.txt > nasb.osis.xml - -nasb.txt: nasb-lockman-src.zip - unzip nasb-lockman-src.zip - mv "nasb cross refs.txt" nasb_ref.txt - -nasb-lockman-src.zip: - scp scribe@host.crosswire.org:~swordmod/pristine-private/nasb/nasb.zip nasb-lockman-src.zip - -deploy: NASB.zip - scp NASB.zip scribe@host.crosswire.org:/home/ftp/pub/sword/lockmanpackages/ - -clean: - rm -rf nasb.osis.xml *.o lockosis modules NASB.zip nasb_ref.txt "nasb cross refs.txt" nasbinfo.txt codenc.txt FRONT95.txt "nasb(c).txt" nasb.txt - -distclean: clean - rm -rf nasb-lockman-src.zip - -.cpp: - g++ -O0 -g -DHAVESWORD -Wall -Werror `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword` - diff --git a/modules/nasb95/Makefile b/modules/nasb95/Makefile new file mode 100644 index 0000000..8c63d7c --- /dev/null +++ b/modules/nasb95/Makefile @@ -0,0 +1,42 @@ +SRC_ZIP_PATH=pristine-private/nasb/historical/nasb.zip +#SRC_ZIP_PATH=pristine-private/nasb/nasb_1995_full_06-15-21.zip +MODNAME=NASB +REPO=lockman + +SRCNAME=nasb.txt +NOTESNAME="nasb cross refs.txt" + +all: $(MODNAME).zip + +$(MODNAME).zip: modules/texts/ztext/nasb/ot.bzv + zip -r $(MODNAME).zip mods.d modules + +modules/texts/ztext/nasb/ot.bzv: nasb.osis.xml + mkdir -p modules/texts/ztext/nasb + osis2mod modules/texts/ztext/nasb/ nasb.osis.xml -z z -b 4 + chmod a+r modules/texts/ztext/nasb/* + +nasb.osis.xml: src.txt lockosis + ./lockosis src.txt notes.txt > nasb.osis.xml + +src.txt: src.zip + mkdir -p tmp + cd tmp && unzip ../src.zip + cd tmp && mv $(SRCNAME) ../src.txt + cd tmp && mv $(NOTESNAME) ../notes.txt + +src.zip: + scp host.crosswire.org:~swordmod/${SRC_ZIP_PATH} src.zip + +deploy: $(MODNAME).zip + scp $(MODNAME).zip host.crosswire.org:/home/ftp/pub/sword/$(REPO)/ + +clean: + rm -rf nasb.osis.xml *.o lockosis modules $(MODNAME).zip notes.txt src.txt tmp + +distclean: clean + rm -rf src.zip + +.cpp: + g++ -O0 -g -DHAVESWORD -Wall -Werror `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword` + diff --git a/modules/nasb/lockosis.cpp b/modules/nasb95/lockosis.cpp index deaadbb..deaadbb 100644 --- a/modules/nasb/lockosis.cpp +++ b/modules/nasb95/lockosis.cpp diff --git a/modules/nasb/mods.d/nasb.conf b/modules/nasb95/mods.d/nasb.conf index 0242173..0242173 100644 --- a/modules/nasb/mods.d/nasb.conf +++ b/modules/nasb95/mods.d/nasb.conf |