[sword-svn] r543 - in trunk/modules: . nasb95

[scribe at crosswire.org]

Author: scribe
Date: 2022-09-10 05:47:55 -0400 (Sat, 10 Sep 2022)
New Revision: 543

Added:
   trunk/modules/nasb95/
Removed:
   trunk/modules/nasb/
Modified:
   trunk/modules/nasb95/Makefile
Log:
Generalized NASB95 conversion a bit in preparation of NASB2020


Modified: trunk/modules/nasb95/Makefile
===================================================================
--- trunk/modules/nasb/Makefile	2022-02-17 18:26:11 UTC (rev 542)
+++ trunk/modules/nasb95/Makefile	2022-09-10 09:47:55 UTC (rev 543)
@@ -1,31 +1,41 @@
-all: NASB.zip
+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
 
-NASB.zip: modules/texts/ztext/nasb/ot.bzv
-	zip -r NASB.zip mods.d modules
+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: nasb.txt lockosis 
-	./lockosis nasb.txt nasb_ref.txt > nasb.osis.xml
+nasb.osis.xml: src.txt lockosis 
+	./lockosis src.txt notes.txt > nasb.osis.xml
 
-nasb.txt: nasb-lockman-src.zip
-	unzip nasb-lockman-src.zip
-	mv "nasb cross refs.txt" nasb_ref.txt
+src.txt: src.zip
+	mkdir -p tmp
+	cd tmp && unzip ../src.zip
+	cd tmp && mv $(SRCNAME) ../src.txt
+	cd tmp && mv $(NOTESNAME) ../notes.txt
 
-nasb-lockman-src.zip:
-	scp scribe at host.crosswire.org:~swordmod/pristine-private/nasb/nasb.zip nasb-lockman-src.zip
+src.zip:
+	scp host.crosswire.org:~swordmod/${SRC_ZIP_PATH} src.zip
 
-deploy: NASB.zip
-	scp NASB.zip scribe at host.crosswire.org:/home/ftp/pub/sword/lockmanpackages/
+deploy: $(MODNAME).zip
+	scp $(MODNAME).zip host.crosswire.org:/home/ftp/pub/sword/$(REPO)/
 
 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
+	rm -rf nasb.osis.xml *.o lockosis modules $(MODNAME).zip notes.txt src.txt tmp
 
 distclean: clean
-	rm -rf nasb-lockman-src.zip
+	rm -rf src.zip
 
 .cpp:
 	g++ -O0 -g -DHAVESWORD -Wall -Werror `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword`