From 1d0ff54794b5edea7cdf1d2d66710a0fa885bcc5 Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Sun, 28 Oct 2018 11:51:26 +0100 Subject: New upstream version 1.8.1 --- utilities/CMakeLists.txt | 38 +- utilities/Makefile.am | 11 +- utilities/Makefile.in | 70 ++-- utilities/addcomment.cpp | 2 +- utilities/addgb.cpp | 2 +- utilities/addld.cpp | 6 +- utilities/addvs.cpp | 2 +- utilities/bcpp6make/cipherraw.bpf | 4 +- utilities/bcpp6make/cipherraw.bpr | 288 +++++++------- utilities/bcpp6make/diatheke.bpf | 10 +- utilities/bcpp6make/diatheke.bpr | 316 +++++++-------- utilities/bcpp6make/imp2gbs.bpf | 4 +- utilities/bcpp6make/imp2gbs.bpr | 288 +++++++------- utilities/bcpp6make/imp2ld.bpf | 4 +- utilities/bcpp6make/imp2ld.bpr | 288 +++++++------- utilities/bcpp6make/imp2vs.bpf | 4 +- utilities/bcpp6make/imp2vs.bpr | 288 +++++++------- utilities/bcpp6make/mkfastmod.bpf | 4 +- utilities/bcpp6make/mkfastmod.bpr | 288 +++++++------- utilities/bcpp6make/mod2imp.bpf | 4 +- utilities/bcpp6make/mod2imp.bpr | 288 +++++++------- utilities/bcpp6make/mod2osis.bpf | 4 +- utilities/bcpp6make/mod2osis.bpr | 288 +++++++------- utilities/bcpp6make/mod2vpl.bpf | 4 +- utilities/bcpp6make/mod2vpl.bpr | 288 +++++++------- utilities/bcpp6make/mod2zmod.bpf | 10 +- utilities/bcpp6make/mod2zmod.bpr | 288 +++++++------- utilities/bcpp6make/osis2mod.bpf | 10 +- utilities/bcpp6make/osis2mod.bpr | 290 +++++++------- utilities/bcpp6make/step2vpl.bpf | 10 +- utilities/bcpp6make/step2vpl.bpr | 288 +++++++------- utilities/bcpp6make/stepdump.bpf | 10 +- utilities/bcpp6make/stepdump.bpr | 288 +++++++------- utilities/bcpp6make/utils.bpg | 178 ++++----- utilities/bcpp6make/vpl2mod.bpf | 10 +- utilities/bcpp6make/vpl2mod.bpr | 288 +++++++------- utilities/bcpp6make/vs2osisref.bpf | 10 +- utilities/bcpp6make/vs2osisref.bpr | 288 +++++++------- utilities/bcpp6make/xml2gbs.bpf | 10 +- utilities/bcpp6make/xml2gbs.bpr | 288 +++++++------- utilities/bcppmake/addgb.bpf | 20 +- utilities/bcppmake/addgb.bpr | 250 ++++++------ utilities/bcppmake/addld.bpf | 20 +- utilities/bcppmake/addld.bpr | 250 ++++++------ utilities/bcppmake/addvs.bpf | 20 +- utilities/bcppmake/addvs.bpr | 250 ++++++------ utilities/bcppmake/cipherraw.bdsproj | 644 +++++++++++++++--------------- utilities/bcppmake/diatheke.bdsproj | 612 ++++++++++++++--------------- utilities/bcppmake/imp2gbs.bdsproj | 646 +++++++++++++++--------------- utilities/bcppmake/imp2ld.bdsproj | 628 ++++++++++++++--------------- utilities/bcppmake/imp2vs.bdsproj | 628 ++++++++++++++--------------- utilities/bcppmake/installmgr.bdsproj | 654 +++++++++++++++---------------- utilities/bcppmake/installmgr.bpf | 22 +- utilities/bcppmake/installmgr.bpr | 246 ++++++------ utilities/bcppmake/mkfastmod.bdsproj | 640 +++++++++++++++--------------- utilities/bcppmake/mod2imp.bdsproj | 622 ++++++++++++++--------------- utilities/bcppmake/mod2osis.bdsproj | 592 ++++++++++++++-------------- utilities/bcppmake/mod2vpl.bdsproj | 622 ++++++++++++++--------------- utilities/bcppmake/mod2zmod.bdsproj | 636 +++++++++++++++--------------- utilities/bcppmake/osis2mod.bdsproj | 612 ++++++++++++++--------------- utilities/bcppmake/step2vpl.bdsproj | 622 ++++++++++++++--------------- utilities/bcppmake/stepdump.bdsproj | 622 ++++++++++++++--------------- utilities/bcppmake/tei2mod.bpf | 20 +- utilities/bcppmake/tei2mod.bpr | 244 ++++++------ utilities/bcppmake/treeidxutil.bpf | 20 +- utilities/bcppmake/treeidxutil.bpr | 242 ++++++------ utilities/bcppmake/utilities.bdsgroup | 80 ++-- utilities/bcppmake/vpl2mod.bdsproj | 622 ++++++++++++++--------------- utilities/bcppmake/vs2osisref.bdsproj | 592 ++++++++++++++-------------- utilities/bcppmake/vs2osisreftxt.bpf | 20 +- utilities/bcppmake/vs2osisreftxt.bpr | 242 ++++++------ utilities/bcppmake/xml2gbs.bdsproj | 638 +++++++++++++++--------------- utilities/cipherraw.cpp | 131 ------- utilities/diatheke/CMakeLists.txt | 24 ++ utilities/diatheke/Makefile.in | 4 +- utilities/diatheke/README | 9 +- utilities/diatheke/corediatheke.cpp | 533 +++++++++++-------------- utilities/diatheke/corediatheke.h | 4 +- utilities/diatheke/diafiltmgr.cpp | 201 +++++++--- utilities/diatheke/diafiltmgr.h | 4 +- utilities/diatheke/diatheke.cpp | 155 ++++---- utilities/diatheke/diatheke.sln | 40 +- utilities/diatheke/diatheke.vcxproj | 396 +++++++++---------- utilities/diatheke/diathekemgr.cpp | 18 +- utilities/diatheke/diathekemgr.h | 8 +- utilities/diatheke/tcl/README | 106 ++--- utilities/diatheke/thmlcgi.cpp | 7 +- utilities/emptyvss.cpp | 12 +- utilities/gbfidx.cpp | 2 +- utilities/genbookutil.cpp | 2 +- utilities/imp2gbs.cpp | 12 +- utilities/imp2ld.cpp | 74 +++- utilities/imp2vs.cpp | 117 ++++-- utilities/installmgr.cpp | 96 ++++- utilities/mkfastmod.cpp | 2 +- utilities/mod2imp.cpp | 9 +- utilities/mod2osis.cpp | 4 +- utilities/mod2vpl.cpp | 2 +- utilities/mod2zmod.cpp | 40 +- utilities/modwrite.cpp | 2 +- utilities/osis2mod.cpp | 501 +++++++++++++++++++---- utilities/step2vpl.cpp | 2 +- utilities/stepdump.cpp | 2 +- utilities/stripaccents.cpp | 79 ++++ utilities/tei2mod.cpp | 60 ++- utilities/treeidxutil.cpp | 2 +- utilities/vcppmake/addgb.vcxproj | 232 +++++------ utilities/vcppmake/addld.vcxproj | 232 +++++------ utilities/vcppmake/addvs.vcxproj | 232 +++++------ utilities/vcppmake/cipherraw.vcxproj | 232 +++++------ utilities/vcppmake/emptyvss.vcxproj | 232 +++++------ utilities/vcppmake/genbookutil.vcxproj | 232 +++++------ utilities/vcppmake/imp2gbs.vcxproj | 232 +++++------ utilities/vcppmake/imp2ld.vcxproj | 232 +++++------ utilities/vcppmake/imp2vs.vcxproj | 232 +++++------ utilities/vcppmake/installmgr.vcxproj | 232 +++++------ utilities/vcppmake/lexdump.vcxproj | 232 +++++------ utilities/vcppmake/mkfastmod.vcxproj | 232 +++++------ utilities/vcppmake/mod2imp.vcxproj | 232 +++++------ utilities/vcppmake/mod2osis.vcxproj | 232 +++++------ utilities/vcppmake/mod2vpl.vcxproj | 232 +++++------ utilities/vcppmake/mod2zmod.vcxproj | 230 +++++------ utilities/vcppmake/modwrite.vcxproj | 232 +++++------ utilities/vcppmake/osis2mod.vcxproj | 244 ++++++------ utilities/vcppmake/step2vpl.vcxproj | 232 +++++------ utilities/vcppmake/stepdump.vcxproj | 232 +++++------ utilities/vcppmake/tei2mod.vcxproj | 232 +++++------ utilities/vcppmake/treeidxutil.vcxproj | 232 +++++------ utilities/vcppmake/utilities.sln | 448 +++++++++------------ utilities/vcppmake/vpl2mod.vcxproj | 232 +++++------ utilities/vcppmake/vs2osisref.vcxproj | 232 +++++------ utilities/vcppmake/vs2osisreftxt.vcxproj | 232 +++++------ utilities/vcppmake/xml2gbs.vcxproj | 232 +++++------ utilities/vpl2mod.cpp | 2 +- utilities/vs2osisref.cpp | 2 +- utilities/vs2osisreftxt.cpp | 2 +- utilities/xml2gbs.cpp | 2 +- 137 files changed, 13654 insertions(+), 13141 deletions(-) delete mode 100644 utilities/cipherraw.cpp create mode 100644 utilities/diatheke/CMakeLists.txt create mode 100644 utilities/stripaccents.cpp (limited to 'utilities') diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt index e7bd82d..bf53481 100644 --- a/utilities/CMakeLists.txt +++ b/utilities/CMakeLists.txt @@ -4,12 +4,12 @@ # The general assumption is that each of these utilities is built from # a single source file, which shares its name with the utility itself (appended with .cpp), # and then linked against the SWORD library. -# +# # This list will be built and installed, if so chosen # # These are in alphbetical order now - please keep them that way # if you edit this list in the future. -# +# SET(install_UTILITIES addld emptyvss @@ -35,14 +35,13 @@ ENDIF(WITH_ZLIB OR WITH_INTERNAL_ZLIB) ###################################################################### # These utilities will be built, but they will not be installed -# +# # Again, I have gone to great lengths of travail to make this list # alphabetical. If you add utilities to this list, please do so in a # way that maintains this. SET(noinstall_UTILITIES addgb addvs - cipherraw gbfidx genbookutil modwrite @@ -54,7 +53,7 @@ SET(noinstall_UTILITIES ##################################################################### # This will loop over both of the above utility lists and add build targets # to the system for each one of them. -# +# FOREACH(UTIL ${install_UTILITIES} ${noinstall_UTILITIES}) ADD_EXECUTABLE("${UTIL}" "${UTIL}.cpp") @@ -68,7 +67,7 @@ ENDFOREACH(UTIL ${install_UTILITIES}) #################################################################### # Just to be difficult, we have a single C file that is a utility # and, therefore, needs its own treatment. -# +# ADD_EXECUTABLE(lexdump lexdump.c) IF(BUILDING_SHARED) @@ -85,7 +84,7 @@ ENDIF(BUILDING_SHARED) # is limited to CMake files in this directory and below, so rather than # replicate the above list in another place, we'll just handle our # own install, since this whole directory is optional, anyway. -# +# FOREACH(UTIL ${install_UTILITIES}) INSTALL(TARGETS ${UTIL} RUNTIME DESTINATION "${BINDIR}" @@ -93,27 +92,4 @@ FOREACH(UTIL ${install_UTILITIES}) ) ENDFOREACH(UTIL ${install_UTILITIES}) -#################################################################### -# And, of course, diatheke is a beast unto itself -# -# Let's go! -# -ADD_EXECUTABLE(diatheke - diatheke/diatheke.cpp - diatheke/corediatheke.cpp - diatheke/diathekemgr.cpp - diatheke/diafiltmgr.cpp - diatheke/thmlcgi.cpp - diatheke/gbfcgi.cpp - diatheke/osiscgi.cpp -) -IF(BUILDING_SHARED) - TARGET_LINK_LIBRARIES(diatheke sword) -ELSE(BUILDING_SHARED) - TARGET_LINK_LIBRARIES(diatheke sword_static) -ENDIF(BUILDING_SHARED) -INSTALL(TARGETS diatheke - DESTINATION "${BINDIR}" - COMPONENT utilities -) - +ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/diatheke") diff --git a/utilities/Makefile.am b/utilities/Makefile.am index ecebb50..c43968c 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -5,12 +5,13 @@ if USE_INTERNAL_REGEX AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la -noinst_PROGRAMS = cipherraw lexdump \ - stepdump step2vpl gbfidx modwrite addvs emptyvss \ - addgb genbookutil treeidxutil addld +noinst_PROGRAMS = lexdump \ + stepdump step2vpl gbfidx modwrite addvs \ + addgb genbookutil treeidxutil addld bin_PROGRAMS = mod2imp mod2osis osis2mod tei2mod vs2osisref vs2osisreftxt \ - mod2vpl mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs imp2ld + mod2vpl mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs imp2ld \ + stripaccents emptyvss if HAVE_LIBZ @@ -22,7 +23,6 @@ endif bin_PROGRAMS += $(ZLIBPROG) -cipherraw_SOURCES = cipherraw.cpp lexdump_SOURCES = lexdump.c lexdump_LDADD = -lstdc++ mkfastmod_SOURCES = mkfastmod.cpp @@ -48,6 +48,7 @@ genbookutil_SOURCES = genbookutil.cpp treeidxutil_SOURCES = treeidxutil.cpp addld_SOURCES = addld.cpp imp2ld_SOURCES = imp2ld.cpp +stripaccents_SOURCES = stripaccents.cpp installmgr_SOURCES = installmgr.cpp diff --git a/utilities/Makefile.in b/utilities/Makefile.in index 03de863..a386b2a 100644 --- a/utilities/Makefile.in +++ b/utilities/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -80,16 +80,16 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex -noinst_PROGRAMS = cipherraw$(EXEEXT) lexdump$(EXEEXT) \ - stepdump$(EXEEXT) step2vpl$(EXEEXT) gbfidx$(EXEEXT) \ - modwrite$(EXEEXT) addvs$(EXEEXT) emptyvss$(EXEEXT) \ +noinst_PROGRAMS = lexdump$(EXEEXT) stepdump$(EXEEXT) step2vpl$(EXEEXT) \ + gbfidx$(EXEEXT) modwrite$(EXEEXT) addvs$(EXEEXT) \ addgb$(EXEEXT) genbookutil$(EXEEXT) treeidxutil$(EXEEXT) \ addld$(EXEEXT) bin_PROGRAMS = mod2imp$(EXEEXT) mod2osis$(EXEEXT) osis2mod$(EXEEXT) \ tei2mod$(EXEEXT) vs2osisref$(EXEEXT) vs2osisreftxt$(EXEEXT) \ mod2vpl$(EXEEXT) mkfastmod$(EXEEXT) vpl2mod$(EXEEXT) \ imp2vs$(EXEEXT) installmgr$(EXEEXT) xml2gbs$(EXEEXT) \ - imp2gbs$(EXEEXT) imp2ld$(EXEEXT) $(am__EXEEXT_1) + imp2gbs$(EXEEXT) imp2ld$(EXEEXT) stripaccents$(EXEEXT) \ + emptyvss$(EXEEXT) $(am__EXEEXT_1) DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \ $(srcdir)/kylixmake/Makefile.am $(srcdir)/perl/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -126,10 +126,6 @@ am_addvs_OBJECTS = addvs.$(OBJEXT) addvs_OBJECTS = $(am_addvs_OBJECTS) addvs_LDADD = $(LDADD) addvs_DEPENDENCIES = $(top_builddir)/lib/libsword.la -am_cipherraw_OBJECTS = cipherraw.$(OBJEXT) -cipherraw_OBJECTS = $(am_cipherraw_OBJECTS) -cipherraw_LDADD = $(LDADD) -cipherraw_DEPENDENCIES = $(top_builddir)/lib/libsword.la am_emptyvss_OBJECTS = emptyvss.$(OBJEXT) emptyvss_OBJECTS = $(am_emptyvss_OBJECTS) emptyvss_LDADD = $(LDADD) @@ -198,6 +194,10 @@ am_stepdump_OBJECTS = stepdump.$(OBJEXT) stepdump_OBJECTS = $(am_stepdump_OBJECTS) stepdump_LDADD = $(LDADD) stepdump_DEPENDENCIES = $(top_builddir)/lib/libsword.la +am_stripaccents_OBJECTS = stripaccents.$(OBJEXT) +stripaccents_OBJECTS = $(am_stripaccents_OBJECTS) +stripaccents_LDADD = $(LDADD) +stripaccents_DEPENDENCIES = $(top_builddir)/lib/libsword.la am_tei2mod_OBJECTS = tei2mod.$(OBJEXT) tei2mod_OBJECTS = $(am_tei2mod_OBJECTS) tei2mod_LDADD = $(LDADD) @@ -275,25 +275,27 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \ - $(cipherraw_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) \ - $(genbookutil_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) \ - $(imp2vs_SOURCES) $(installmgr_SOURCES) $(lexdump_SOURCES) \ - $(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) \ - $(mod2vpl_SOURCES) $(mod2zmod_SOURCES) $(modwrite_SOURCES) \ - $(osis2mod_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) \ - $(tei2mod_SOURCES) $(treeidxutil_SOURCES) $(vpl2mod_SOURCES) \ + $(emptyvss_SOURCES) $(gbfidx_SOURCES) $(genbookutil_SOURCES) \ + $(imp2gbs_SOURCES) $(imp2ld_SOURCES) $(imp2vs_SOURCES) \ + $(installmgr_SOURCES) $(lexdump_SOURCES) $(mkfastmod_SOURCES) \ + $(mod2imp_SOURCES) $(mod2osis_SOURCES) $(mod2vpl_SOURCES) \ + $(mod2zmod_SOURCES) $(modwrite_SOURCES) $(osis2mod_SOURCES) \ + $(step2vpl_SOURCES) $(stepdump_SOURCES) \ + $(stripaccents_SOURCES) $(tei2mod_SOURCES) \ + $(treeidxutil_SOURCES) $(vpl2mod_SOURCES) \ $(vs2osisref_SOURCES) $(vs2osisreftxt_SOURCES) \ $(xml2gbs_SOURCES) DIST_SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \ - $(cipherraw_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) \ - $(genbookutil_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) \ - $(imp2vs_SOURCES) $(installmgr_SOURCES) $(lexdump_SOURCES) \ - $(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) \ - $(mod2vpl_SOURCES) $(am__mod2zmod_SOURCES_DIST) \ - $(modwrite_SOURCES) $(osis2mod_SOURCES) $(step2vpl_SOURCES) \ - $(stepdump_SOURCES) $(tei2mod_SOURCES) $(treeidxutil_SOURCES) \ - $(vpl2mod_SOURCES) $(vs2osisref_SOURCES) \ - $(vs2osisreftxt_SOURCES) $(xml2gbs_SOURCES) + $(emptyvss_SOURCES) $(gbfidx_SOURCES) $(genbookutil_SOURCES) \ + $(imp2gbs_SOURCES) $(imp2ld_SOURCES) $(imp2vs_SOURCES) \ + $(installmgr_SOURCES) $(lexdump_SOURCES) $(mkfastmod_SOURCES) \ + $(mod2imp_SOURCES) $(mod2osis_SOURCES) $(mod2vpl_SOURCES) \ + $(am__mod2zmod_SOURCES_DIST) $(modwrite_SOURCES) \ + $(osis2mod_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) \ + $(stripaccents_SOURCES) $(tei2mod_SOURCES) \ + $(treeidxutil_SOURCES) $(vpl2mod_SOURCES) \ + $(vs2osisref_SOURCES) $(vs2osisreftxt_SOURCES) \ + $(xml2gbs_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -514,9 +516,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_bzip2 = @with_bzip2@ with_conf = @with_conf@ with_icu = @with_icu@ with_icusword = @with_icusword@ +with_xz = @with_xz@ with_zlib = @with_zlib@ AUTOMAKE_OPTIONS = 1.6 SUBDIRS = diatheke @@ -524,7 +528,6 @@ AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la @HAVE_LIBZ_FALSE@ZLIBPROG = @HAVE_LIBZ_TRUE@ZLIBPROG = mod2zmod -cipherraw_SOURCES = cipherraw.cpp lexdump_SOURCES = lexdump.c lexdump_LDADD = -lstdc++ mkfastmod_SOURCES = mkfastmod.cpp @@ -550,6 +553,7 @@ genbookutil_SOURCES = genbookutil.cpp treeidxutil_SOURCES = treeidxutil.cpp addld_SOURCES = addld.cpp imp2ld_SOURCES = imp2ld.cpp +stripaccents_SOURCES = stripaccents.cpp installmgr_SOURCES = installmgr.cpp @HAVE_LIBZ_TRUE@mod2zmod_SOURCES = mod2zmod.cpp EXTRA_DIST = $(swbcppmakedir)/imp2ld.bpf $(swbcppmakedir)/mod2imp.bpf \ @@ -684,10 +688,6 @@ addvs$(EXEEXT): $(addvs_OBJECTS) $(addvs_DEPENDENCIES) $(EXTRA_addvs_DEPENDENCIE @rm -f addvs$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(addvs_OBJECTS) $(addvs_LDADD) $(LIBS) -cipherraw$(EXEEXT): $(cipherraw_OBJECTS) $(cipherraw_DEPENDENCIES) $(EXTRA_cipherraw_DEPENDENCIES) - @rm -f cipherraw$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(cipherraw_OBJECTS) $(cipherraw_LDADD) $(LIBS) - emptyvss$(EXEEXT): $(emptyvss_OBJECTS) $(emptyvss_DEPENDENCIES) $(EXTRA_emptyvss_DEPENDENCIES) @rm -f emptyvss$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(emptyvss_OBJECTS) $(emptyvss_LDADD) $(LIBS) @@ -756,6 +756,10 @@ stepdump$(EXEEXT): $(stepdump_OBJECTS) $(stepdump_DEPENDENCIES) $(EXTRA_stepdump @rm -f stepdump$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(stepdump_OBJECTS) $(stepdump_LDADD) $(LIBS) +stripaccents$(EXEEXT): $(stripaccents_OBJECTS) $(stripaccents_DEPENDENCIES) $(EXTRA_stripaccents_DEPENDENCIES) + @rm -f stripaccents$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(stripaccents_OBJECTS) $(stripaccents_LDADD) $(LIBS) + tei2mod$(EXEEXT): $(tei2mod_OBJECTS) $(tei2mod_DEPENDENCIES) $(EXTRA_tei2mod_DEPENDENCIES) @rm -f tei2mod$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(tei2mod_OBJECTS) $(tei2mod_LDADD) $(LIBS) @@ -789,7 +793,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addgb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addld.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addvs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipherraw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emptyvss.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfidx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genbookutil.Po@am__quote@ @@ -807,6 +810,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osis2mod.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/step2vpl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepdump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripaccents.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tei2mod.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeidxutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpl2mod.Po@am__quote@ @@ -819,14 +823,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/utilities/addcomment.cpp b/utilities/addcomment.cpp index 46de6a7..8dc8d16 100644 --- a/utilities/addcomment.cpp +++ b/utilities/addcomment.cpp @@ -2,7 +2,7 @@ * * addcomment.cpp - * - * $Id: addcomment.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: addcomment.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/addgb.cpp b/utilities/addgb.cpp index 5aef649..60dbbc4 100644 --- a/utilities/addgb.cpp +++ b/utilities/addgb.cpp @@ -3,7 +3,7 @@ * addgb.cpp - Utility to create/modify a GenBook module by adding a single * entry * - * $Id: addgb.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: addgb.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/addld.cpp b/utilities/addld.cpp index 7e43361..f8a9b71 100644 --- a/utilities/addld.cpp +++ b/utilities/addld.cpp @@ -2,7 +2,7 @@ * * addld.cpp - Utility to build/modify an LD module by adding a single entry * - * $Id: addld.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: addld.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -40,11 +40,15 @@ #include #include #include +#ifndef EXCLUDEZLIB #include +#endif #ifndef NO_SWORD_NAMESPACE using sword::SWMgr; +#ifndef EXCLUDEZLIB using sword::ZipCompress; +#endif using sword::RawLD4; using sword::SWKey; using sword::zLD; diff --git a/utilities/addvs.cpp b/utilities/addvs.cpp index 270154b..869b54d 100644 --- a/utilities/addvs.cpp +++ b/utilities/addvs.cpp @@ -3,7 +3,7 @@ * addvs.cpp - Utility to create/modify a VerseKey module by adding a single * entry * - * $Id: addvs.cpp 2893 2013-07-16 03:07:02Z scribe $ + * $Id: addvs.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/bcpp6make/cipherraw.bpf b/utilities/bcpp6make/cipherraw.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/cipherraw.bpf +++ b/utilities/bcpp6make/cipherraw.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/cipherraw.bpr b/utilities/bcpp6make/cipherraw.bpr index 25e48f3..22b1d3b 100644 --- a/utilities/bcpp6make/cipherraw.bpr +++ b/utilities/bcpp6make/cipherraw.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/diatheke.bpf b/utilities/bcpp6make/diatheke.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/diatheke.bpf +++ b/utilities/bcpp6make/diatheke.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/diatheke.bpr b/utilities/bcpp6make/diatheke.bpr index d1d25a8..9d471e7 100644 --- a/utilities/bcpp6make/diatheke.bpr +++ b/utilities/bcpp6make/diatheke.bpr @@ -1,159 +1,159 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=8 -Item0=..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common;Z:\Biblie\SRC\icu-sword\source\i18n -Item1=..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common -Item2=..\diatheke;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common -Item3=..\diatheke;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item4=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item5=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item6=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item7=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=7 -Item0=..\diatheke;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..\diatheke;..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item3=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item5=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item6=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=-b system -k modulelist -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication=Z:\Biblie\SRC\sword\utilities\CBuilder6\stage\diatheke.exe -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=8 +Item0=..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common;Z:\Biblie\SRC\icu-sword\source\i18n +Item1=..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common +Item2=..\diatheke;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common +Item3=..\diatheke;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item4=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item5=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item6=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item7=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=7 +Item0=..\diatheke;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..\diatheke;..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item3=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item5=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item6=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=-b system -k modulelist +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication=Z:\Biblie\SRC\sword\utilities\CBuilder6\stage\diatheke.exe +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/imp2gbs.bpf b/utilities/bcpp6make/imp2gbs.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/imp2gbs.bpf +++ b/utilities/bcpp6make/imp2gbs.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/imp2gbs.bpr b/utilities/bcpp6make/imp2gbs.bpr index 095e1a8..683f716 100644 --- a/utilities/bcpp6make/imp2gbs.bpr +++ b/utilities/bcpp6make/imp2gbs.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/imp2ld.bpf b/utilities/bcpp6make/imp2ld.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/imp2ld.bpf +++ b/utilities/bcpp6make/imp2ld.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/imp2ld.bpr b/utilities/bcpp6make/imp2ld.bpr index 9d52d2f..600b998 100644 --- a/utilities/bcpp6make/imp2ld.bpr +++ b/utilities/bcpp6make/imp2ld.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/imp2vs.bpf b/utilities/bcpp6make/imp2vs.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/imp2vs.bpf +++ b/utilities/bcpp6make/imp2vs.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/imp2vs.bpr b/utilities/bcpp6make/imp2vs.bpr index 78f3dd8..165c9d1 100644 --- a/utilities/bcpp6make/imp2vs.bpr +++ b/utilities/bcpp6make/imp2vs.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/mkfastmod.bpf b/utilities/bcpp6make/mkfastmod.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/mkfastmod.bpf +++ b/utilities/bcpp6make/mkfastmod.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/mkfastmod.bpr b/utilities/bcpp6make/mkfastmod.bpr index f91620b..1e85e2a 100644 --- a/utilities/bcpp6make/mkfastmod.bpr +++ b/utilities/bcpp6make/mkfastmod.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/mod2imp.bpf b/utilities/bcpp6make/mod2imp.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/mod2imp.bpf +++ b/utilities/bcpp6make/mod2imp.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/mod2imp.bpr b/utilities/bcpp6make/mod2imp.bpr index f5a9f9c..80e343f 100644 --- a/utilities/bcpp6make/mod2imp.bpr +++ b/utilities/bcpp6make/mod2imp.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/mod2osis.bpf b/utilities/bcpp6make/mod2osis.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/mod2osis.bpf +++ b/utilities/bcpp6make/mod2osis.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/mod2osis.bpr b/utilities/bcpp6make/mod2osis.bpr index 9755a8d..a1cfec4 100644 --- a/utilities/bcpp6make/mod2osis.bpr +++ b/utilities/bcpp6make/mod2osis.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=WHAC -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=WHAC +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/mod2vpl.bpf b/utilities/bcpp6make/mod2vpl.bpf index 5da8824..295d3e0 100644 --- a/utilities/bcpp6make/mod2vpl.bpf +++ b/utilities/bcpp6make/mod2vpl.bpf @@ -1,3 +1,3 @@ -This file is used by the project manager only and should be treated like the project file +This file is used by the project manager only and should be treated like the project file - main \ No newline at end of file +main \ No newline at end of file diff --git a/utilities/bcpp6make/mod2vpl.bpr b/utilities/bcpp6make/mod2vpl.bpr index 90ca034..c6c16d3 100644 --- a/utilities/bcpp6make/mod2vpl.bpr +++ b/utilities/bcpp6make/mod2vpl.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/mod2zmod.bpf b/utilities/bcpp6make/mod2zmod.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/mod2zmod.bpf +++ b/utilities/bcpp6make/mod2zmod.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/mod2zmod.bpr b/utilities/bcpp6make/mod2zmod.bpr index 867e102..8e48506 100644 --- a/utilities/bcpp6make/mod2zmod.bpr +++ b/utilities/bcpp6make/mod2zmod.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/osis2mod.bpf b/utilities/bcpp6make/osis2mod.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/osis2mod.bpf +++ b/utilities/bcpp6make/osis2mod.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/osis2mod.bpr b/utilities/bcpp6make/osis2mod.bpr index 2ba8c78..92b69a1 100644 --- a/utilities/bcpp6make/osis2mod.bpr +++ b/utilities/bcpp6make/osis2mod.bpr @@ -1,146 +1,146 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=3 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0 -Item2=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=WHAC -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=3 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0 +Item2=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=WHAC +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/step2vpl.bpf b/utilities/bcpp6make/step2vpl.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/step2vpl.bpf +++ b/utilities/bcpp6make/step2vpl.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/step2vpl.bpr b/utilities/bcpp6make/step2vpl.bpr index f29d65e..21bc79d 100644 --- a/utilities/bcpp6make/step2vpl.bpr +++ b/utilities/bcpp6make/step2vpl.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/stepdump.bpf b/utilities/bcpp6make/stepdump.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/stepdump.bpf +++ b/utilities/bcpp6make/stepdump.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/stepdump.bpr b/utilities/bcpp6make/stepdump.bpr index b3db81c..e69f69d 100644 --- a/utilities/bcpp6make/stepdump.bpr +++ b/utilities/bcpp6make/stepdump.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/utils.bpg b/utilities/bcpp6make/utils.bpg index 258f6bb..69d0616 100644 --- a/utilities/bcpp6make/utils.bpg +++ b/utilities/bcpp6make/utils.bpg @@ -1,89 +1,89 @@ -#------------------------------------------------------------------------------ -VERSION = BWS.01 -#------------------------------------------------------------------------------ -!ifndef ROOT -ROOT = $(MAKEDIR)\.. -!endif -#------------------------------------------------------------------------------ -MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** -DCC = $(ROOT)\bin\dcc32.exe $** -BRCC = $(ROOT)\bin\brcc32.exe $** -#------------------------------------------------------------------------------ -PROJECTS = icuinbcb6.lib icuucbcb6.lib libsword6icu.lib cipherraw.exe imp2gbs.exe imp2ld.exe imp2vs.exe mkfastmod.exe mod2imp.exe mod2osis.exe mod2vpl.exe mod2zmod.exe osis2mod.exe step2vpl.exe stepdump.exe vpl2mod.exe vs2osisref.exe xml2gbs.exe -#------------------------------------------------------------------------------ -default: $(PROJECTS) -#------------------------------------------------------------------------------ - -cipherraw.exe: cipherraw.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -imp2gbs.exe: imp2gbs.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -imp2ld.exe: imp2ld.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -imp2vs.exe: imp2vs.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -mkfastmod.exe: mkfastmod.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -mod2imp.exe: mod2imp.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -mod2osis.exe: mod2osis.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -mod2vpl.exe: mod2vpl.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -mod2zmod.exe: mod2zmod.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -osis2mod.exe: osis2mod.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -step2vpl.exe: step2vpl.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -stepdump.exe: stepdump.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -vpl2mod.exe: vpl2mod.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -vs2osisref.exe: vs2osisref.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -xml2gbs.exe: xml2gbs.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -libsword6icu.lib: ..\..\..\sword\lib\bcppmake\libsword6icu.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -icuinbcb6.lib: ..\..\..\icu-sword\as_is\borland\icuinbcb6.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - -icuucbcb6.lib: ..\..\..\icu-sword\as_is\borland\icuucbcb6.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - - +#------------------------------------------------------------------------------ +VERSION = BWS.01 +#------------------------------------------------------------------------------ +!ifndef ROOT +ROOT = $(MAKEDIR)\.. +!endif +#------------------------------------------------------------------------------ +MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** +DCC = $(ROOT)\bin\dcc32.exe $** +BRCC = $(ROOT)\bin\brcc32.exe $** +#------------------------------------------------------------------------------ +PROJECTS = icuinbcb6.lib icuucbcb6.lib libsword6icu.lib cipherraw.exe imp2gbs.exe imp2ld.exe imp2vs.exe mkfastmod.exe mod2imp.exe mod2osis.exe mod2vpl.exe mod2zmod.exe osis2mod.exe step2vpl.exe stepdump.exe vpl2mod.exe vs2osisref.exe xml2gbs.exe +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +cipherraw.exe: cipherraw.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +imp2gbs.exe: imp2gbs.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +imp2ld.exe: imp2ld.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +imp2vs.exe: imp2vs.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +mkfastmod.exe: mkfastmod.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +mod2imp.exe: mod2imp.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +mod2osis.exe: mod2osis.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +mod2vpl.exe: mod2vpl.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +mod2zmod.exe: mod2zmod.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +osis2mod.exe: osis2mod.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +step2vpl.exe: step2vpl.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +stepdump.exe: stepdump.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +vpl2mod.exe: vpl2mod.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +vs2osisref.exe: vs2osisref.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +xml2gbs.exe: xml2gbs.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +libsword6icu.lib: ..\..\..\sword\lib\bcppmake\libsword6icu.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +icuinbcb6.lib: ..\..\..\icu-sword\as_is\borland\icuinbcb6.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +icuucbcb6.lib: ..\..\..\icu-sword\as_is\borland\icuucbcb6.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + + diff --git a/utilities/bcpp6make/vpl2mod.bpf b/utilities/bcpp6make/vpl2mod.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/vpl2mod.bpf +++ b/utilities/bcpp6make/vpl2mod.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/vpl2mod.bpr b/utilities/bcpp6make/vpl2mod.bpr index 2c135d6..3770d53 100644 --- a/utilities/bcpp6make/vpl2mod.bpr +++ b/utilities/bcpp6make/vpl2mod.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/vs2osisref.bpf b/utilities/bcpp6make/vs2osisref.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/vs2osisref.bpf +++ b/utilities/bcpp6make/vs2osisref.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/vs2osisref.bpr b/utilities/bcpp6make/vs2osisref.bpr index c2d8334..30ae877 100644 --- a/utilities/bcpp6make/vs2osisref.bpr +++ b/utilities/bcpp6make/vs2osisref.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcpp6make/xml2gbs.bpf b/utilities/bcpp6make/xml2gbs.bpf index 4c1e949..137862a 100644 --- a/utilities/bcpp6make/xml2gbs.bpf +++ b/utilities/bcpp6make/xml2gbs.bpf @@ -1,6 +1,6 @@ - -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - + +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcpp6make/xml2gbs.bpr b/utilities/bcpp6make/xml2gbs.bpr index a15c843..30c164d 100644 --- a/utilities/bcpp6make/xml2gbs.bpr +++ b/utilities/bcpp6make/xml2gbs.bpr @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item1=_DEBUG - -[HistoryLists\hlIntOutputDir] -Count=2 -Item0=obj -Item1=obj\ - -[HistoryLists\hlFinalOutputDir] -Count=1 -Item0=stage\ - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=test test.osis.xml 0 -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item1=_DEBUG + +[HistoryLists\hlIntOutputDir] +Count=2 +Item0=obj +Item1=obj\ + +[HistoryLists\hlFinalOutputDir] +Count=1 +Item0=stage\ + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=test test.osis.xml 0 +Launcher= +UseLauncher=0 +DebugCWD= +HostApplication= +RemoteHost= +RemotePath= +RemoteLauncher= +RemoteCWD= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 + \ No newline at end of file diff --git a/utilities/bcppmake/addgb.bpf b/utilities/bcppmake/addgb.bpf index ef1bf22..48c973b 100644 --- a/utilities/bcppmake/addgb.bpf +++ b/utilities/bcppmake/addgb.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\addgb.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\addgb.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/addgb.bpr b/utilities/bcppmake/addgb.bpr index 6a6900d..ed0be63 100644 --- a/utilities/bcppmake/addgb.bpr +++ b/utilities/bcppmake/addgb.bpr @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=5 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n -Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING -Item1=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=./nasb nasb.xml -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=5 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n +Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING +Item1=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/addld.bpf b/utilities/bcppmake/addld.bpf index 229b854..0540bd8 100644 --- a/utilities/bcppmake/addld.bpf +++ b/utilities/bcppmake/addld.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\addld.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\addld.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/addld.bpr b/utilities/bcppmake/addld.bpr index 802a76b..5ccede9 100644 --- a/utilities/bcppmake/addld.bpr +++ b/utilities/bcppmake/addld.bpr @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=5 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n -Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING -Item1=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=./nasb nasb.xml -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=5 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n +Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING +Item1=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/addvs.bpf b/utilities/bcppmake/addvs.bpf index f104965..4805f43 100644 --- a/utilities/bcppmake/addvs.bpf +++ b/utilities/bcppmake/addvs.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\addvs.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\addvs.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/addvs.bpr b/utilities/bcppmake/addvs.bpr index 9b65752..d9e5dc8 100644 --- a/utilities/bcppmake/addvs.bpr +++ b/utilities/bcppmake/addvs.bpr @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=5 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n -Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING -Item1=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=./nasb nasb.xml -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=5 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n +Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING +Item1=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/cipherraw.bdsproj b/utilities/bcppmake/cipherraw.bdsproj index b36d5e5..1734aa9 100644 --- a/utilities/bcppmake/cipherraw.bdsproj +++ b/utilities/bcppmake/cipherraw.bdsproj @@ -1,322 +1,322 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 3 - _ICU_;_ICUSWORD_;USBINARY - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - cipherraw.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 3 + _ICU_;_ICUSWORD_;USBINARY + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + cipherraw.bpf + + + diff --git a/utilities/bcppmake/diatheke.bdsproj b/utilities/bcppmake/diatheke.bdsproj index 18546e6..3b86e3e 100644 --- a/utilities/bcppmake/diatheke.bdsproj +++ b/utilities/bcppmake/diatheke.bdsproj @@ -1,306 +1,306 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 3 - ..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include - ..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\ - ..\diatheke;$(BCB)\include;$(BCB)\include\vcl - - - 2 - ..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\diatheke;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 1 - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - diatheke.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 3 + ..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include + ..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\ + ..\diatheke;$(BCB)\include;$(BCB)\include\vcl + + + 2 + ..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\diatheke;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 1 + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + diatheke.bpf + + + diff --git a/utilities/bcppmake/imp2gbs.bdsproj b/utilities/bcppmake/imp2gbs.bdsproj index 0db98c5..8997b52 100644 --- a/utilities/bcppmake/imp2gbs.bdsproj +++ b/utilities/bcppmake/imp2gbs.bdsproj @@ -1,323 +1,323 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - imp2gbs.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + imp2gbs.bpf + + + diff --git a/utilities/bcppmake/imp2ld.bdsproj b/utilities/bcppmake/imp2ld.bdsproj index b02285d..014569b 100644 --- a/utilities/bcppmake/imp2ld.bdsproj +++ b/utilities/bcppmake/imp2ld.bdsproj @@ -1,314 +1,314 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - imp2ld.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + imp2ld.bpf + + + diff --git a/utilities/bcppmake/imp2vs.bdsproj b/utilities/bcppmake/imp2vs.bdsproj index 5eddfb1..f7b125b 100644 --- a/utilities/bcppmake/imp2vs.bdsproj +++ b/utilities/bcppmake/imp2vs.bdsproj @@ -1,314 +1,314 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - imp2vs.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + imp2vs.bpf + + + diff --git a/utilities/bcppmake/installmgr.bdsproj b/utilities/bcppmake/installmgr.bdsproj index ef5de9b..bf61237 100644 --- a/utilities/bcppmake/installmgr.bdsproj +++ b/utilities/bcppmake/installmgr.bdsproj @@ -1,327 +1,327 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - RWP ./ 3 2 abc - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - installmgr.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + RWP ./ 3 2 abc + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + installmgr.bpf + + + diff --git a/utilities/bcppmake/installmgr.bpf b/utilities/bcppmake/installmgr.bpf index b9a4c05..509d35b 100644 --- a/utilities/bcppmake/installmgr.bpf +++ b/utilities/bcppmake/installmgr.bpf @@ -1,12 +1,12 @@ -USEUNIT("..\installmgr.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -USELIB("..\..\..\biblecs\apps\InstallMgr\libcurl.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\installmgr.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +USELIB("..\..\..\biblecs\apps\InstallMgr\libcurl.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/installmgr.bpr b/utilities/bcppmake/installmgr.bpr index a4fa19e..8e30609 100644 --- a/utilities/bcppmake/installmgr.bpr +++ b/utilities/bcppmake/installmgr.bpr @@ -1,124 +1,124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=2 -Item0=_ICU_;_ICUSWORD_ -Item1=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=RWP ./ 3 2 abc -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=2 +Item0=_ICU_;_ICUSWORD_ +Item1=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=RWP ./ 3 2 abc +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/mkfastmod.bdsproj b/utilities/bcppmake/mkfastmod.bdsproj index ffd1675..a573ab6 100644 --- a/utilities/bcppmake/mkfastmod.bdsproj +++ b/utilities/bcppmake/mkfastmod.bdsproj @@ -1,320 +1,320 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 3 - _ICU_;_ICUSWORD_;_DEBUG - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - KJV - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - mkfastmod.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 3 + _ICU_;_ICUSWORD_;_DEBUG + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + KJV + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + mkfastmod.bpf + + + diff --git a/utilities/bcppmake/mod2imp.bdsproj b/utilities/bcppmake/mod2imp.bdsproj index d6f811b..072db6d 100644 --- a/utilities/bcppmake/mod2imp.bdsproj +++ b/utilities/bcppmake/mod2imp.bdsproj @@ -1,311 +1,311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - mod2imp.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + mod2imp.bpf + + + diff --git a/utilities/bcppmake/mod2osis.bdsproj b/utilities/bcppmake/mod2osis.bdsproj index 72c5100..b2c3ab4 100644 --- a/utilities/bcppmake/mod2osis.bdsproj +++ b/utilities/bcppmake/mod2osis.bdsproj @@ -1,296 +1,296 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 1 - _DEBUG - - - $(BCB)\source\vcl - - - KJV - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - mod2osis.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 1 + _DEBUG + + + $(BCB)\source\vcl + + + KJV + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + mod2osis.bpf + + + diff --git a/utilities/bcppmake/mod2vpl.bdsproj b/utilities/bcppmake/mod2vpl.bdsproj index 446bd36..b797d1c 100644 --- a/utilities/bcppmake/mod2vpl.bdsproj +++ b/utilities/bcppmake/mod2vpl.bdsproj @@ -1,311 +1,311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - RWP ./ 3 2 abc - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - mod2vpl.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + RWP ./ 3 2 abc + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + mod2vpl.bpf + + + diff --git a/utilities/bcppmake/mod2zmod.bdsproj b/utilities/bcppmake/mod2zmod.bdsproj index 84040df..6bf89f6 100644 --- a/utilities/bcppmake/mod2zmod.bdsproj +++ b/utilities/bcppmake/mod2zmod.bdsproj @@ -1,318 +1,318 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 5 - _ICU_;_ICUSWORD_;USBINARY - _ICU_;_ICUSWORD_;USBINARY;_DEBUG - _ICU_;_ICUSWORD_ - _ICU_;_ICUSWORD_;_DEBUG - _DEBUG - - - $(BCB)\source\vcl - - - KJV ./ 3 2 abc - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - mod2zmod.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 5 + _ICU_;_ICUSWORD_;USBINARY + _ICU_;_ICUSWORD_;USBINARY;_DEBUG + _ICU_;_ICUSWORD_ + _ICU_;_ICUSWORD_;_DEBUG + _DEBUG + + + $(BCB)\source\vcl + + + KJV ./ 3 2 abc + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + mod2zmod.bpf + + + diff --git a/utilities/bcppmake/osis2mod.bdsproj b/utilities/bcppmake/osis2mod.bdsproj index 33c9e37..9eba1d0 100644 --- a/utilities/bcppmake/osis2mod.bdsproj +++ b/utilities/bcppmake/osis2mod.bdsproj @@ -1,306 +1,306 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 1 - _DEBUG - - - $(BCB)\source\vcl - - - ./nasb nasb.xml - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - osis2mod.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 1 + _DEBUG + + + $(BCB)\source\vcl + + + ./nasb nasb.xml + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + osis2mod.bpf + + + diff --git a/utilities/bcppmake/step2vpl.bdsproj b/utilities/bcppmake/step2vpl.bdsproj index 1310329..ef1a9ec 100644 --- a/utilities/bcppmake/step2vpl.bdsproj +++ b/utilities/bcppmake/step2vpl.bdsproj @@ -1,311 +1,311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - step2vpl.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + step2vpl.bpf + + + diff --git a/utilities/bcppmake/stepdump.bdsproj b/utilities/bcppmake/stepdump.bdsproj index 7f74a93..c0acb6f 100644 --- a/utilities/bcppmake/stepdump.bdsproj +++ b/utilities/bcppmake/stepdump.bdsproj @@ -1,311 +1,311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - stepdump.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + stepdump.bpf + + + diff --git a/utilities/bcppmake/tei2mod.bpf b/utilities/bcppmake/tei2mod.bpf index 9ce2914..767a00f 100644 --- a/utilities/bcppmake/tei2mod.bpf +++ b/utilities/bcppmake/tei2mod.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\tei2mod.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\tei2mod.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/tei2mod.bpr b/utilities/bcppmake/tei2mod.bpr index bec58cd..0c2df8a 100644 --- a/utilities/bcppmake/tei2mod.bpr +++ b/utilities/bcppmake/tei2mod.bpr @@ -1,123 +1,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=1 -Item0=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=./nasb nasb.xml -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=1 +Item0=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=1 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/treeidxutil.bpf b/utilities/bcppmake/treeidxutil.bpf index 88eaef2..d65b95b 100644 --- a/utilities/bcppmake/treeidxutil.bpf +++ b/utilities/bcppmake/treeidxutil.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\treeidxutil.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\treeidxutil.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/treeidxutil.bpr b/utilities/bcppmake/treeidxutil.bpr index 8c3caed..147b431 100644 --- a/utilities/bcppmake/treeidxutil.bpr +++ b/utilities/bcppmake/treeidxutil.bpr @@ -1,122 +1,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=1 -Item0=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=Gen1:1 -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=1 +Item0=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=Gen1:1 +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/utilities.bdsgroup b/utilities/bcppmake/utilities.bdsgroup index 278a47a..cf3e322 100644 --- a/utilities/bcppmake/utilities.bdsgroup +++ b/utilities/bcppmake/utilities.bdsgroup @@ -1,40 +1,40 @@ - - - - - - - - - - - - - ..\..\..\icu-sword\as_is\borland\icuuc.bdsproj - ..\..\..\icu-sword\as_is\borland\icuin.bdsproj - ..\..\..\biblecs\apps\InstallMgr\libcurl.bdsproj - ..\..\..\biblecs\clucene\clucene.bdsproj - ..\..\lib\bcppmake\libsword.bdsproj - osis2mod.bdsproj - mod2zmod.bdsproj - mod2vpl.bdsproj - mkfastmod.bdsproj - imp2gbs.bdsproj - vpl2mod.bdsproj - imp2ld.bdsproj - imp2vs.bdsproj - mod2imp.bdsproj - cipherraw.bdsproj - step2vpl.bdsproj - stepdump.bdsproj - mod2osis.bdsproj - vs2osisref.bdsproj - diatheke.bdsproj - xml2gbs.bdsproj - installmgr.bdsproj - icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib osis2mod.exe mod2zmod.exe mod2vpl.exe mkfastmod.exe imp2gbs.exe vpl2mod.exe imp2ld.exe imp2vs.exe mod2imp.exe cipherraw.exe step2vpl.exe stepdump.exe mod2osis.exe vs2osisref.exe diatheke.exe xml2gbs.exe installmgr.exe - - - - + + + + + + + + + + + + + ..\..\..\icu-sword\as_is\borland\icuuc.bdsproj + ..\..\..\icu-sword\as_is\borland\icuin.bdsproj + ..\..\..\biblecs\apps\InstallMgr\libcurl.bdsproj + ..\..\..\biblecs\clucene\clucene.bdsproj + ..\..\lib\bcppmake\libsword.bdsproj + osis2mod.bdsproj + mod2zmod.bdsproj + mod2vpl.bdsproj + mkfastmod.bdsproj + imp2gbs.bdsproj + vpl2mod.bdsproj + imp2ld.bdsproj + imp2vs.bdsproj + mod2imp.bdsproj + cipherraw.bdsproj + step2vpl.bdsproj + stepdump.bdsproj + mod2osis.bdsproj + vs2osisref.bdsproj + diatheke.bdsproj + xml2gbs.bdsproj + installmgr.bdsproj + icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib osis2mod.exe mod2zmod.exe mod2vpl.exe mkfastmod.exe imp2gbs.exe vpl2mod.exe imp2ld.exe imp2vs.exe mod2imp.exe cipherraw.exe step2vpl.exe stepdump.exe mod2osis.exe vs2osisref.exe diatheke.exe xml2gbs.exe installmgr.exe + + + + diff --git a/utilities/bcppmake/vpl2mod.bdsproj b/utilities/bcppmake/vpl2mod.bdsproj index 1c61323..eabf08e 100644 --- a/utilities/bcppmake/vpl2mod.bdsproj +++ b/utilities/bcppmake/vpl2mod.bdsproj @@ -1,311 +1,311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 2 - _ICU_;_ICUSWORD_ - _DEBUG - - - $(BCB)\source\vcl - - - - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - vpl2mod.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 2 + _ICU_;_ICUSWORD_ + _DEBUG + + + $(BCB)\source\vcl + + + + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + vpl2mod.bpf + + + diff --git a/utilities/bcppmake/vs2osisref.bdsproj b/utilities/bcppmake/vs2osisref.bdsproj index e8867d6..a0e22ca 100644 --- a/utilities/bcppmake/vs2osisref.bdsproj +++ b/utilities/bcppmake/vs2osisref.bdsproj @@ -1,296 +1,296 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 1 - _DEBUG - - - $(BCB)\source\vcl - - - Gen1:1 - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - vs2osisref.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 1 + _DEBUG + + + $(BCB)\source\vcl + + + Gen1:1 + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + vs2osisref.bpf + + + diff --git a/utilities/bcppmake/vs2osisreftxt.bpf b/utilities/bcppmake/vs2osisreftxt.bpf index fd5c23e..d995756 100644 --- a/utilities/bcppmake/vs2osisreftxt.bpf +++ b/utilities/bcppmake/vs2osisreftxt.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\vs2osisreftxt.cpp"); -USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); -USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); -USELIB("..\..\lib\libsword.lib"); -USELIB("..\..\..\biblecs\clucene\clucene.lib"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file - - +USEUNIT("..\vs2osisreftxt.cpp"); +USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib"); +USELIB("..\..\lib\libsword.lib"); +USELIB("..\..\..\biblecs\clucene\clucene.lib"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file + + main \ No newline at end of file diff --git a/utilities/bcppmake/vs2osisreftxt.bpr b/utilities/bcppmake/vs2osisreftxt.bpr index 9615797..5793c2c 100644 --- a/utilities/bcppmake/vs2osisreftxt.bpr +++ b/utilities/bcppmake/vs2osisreftxt.bpr @@ -1,122 +1,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=4 -Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=5 -Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib -Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=1 -Item0=_DEBUG - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams=Gen1:1 -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription= +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=4 +Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + +[HistoryLists\hlLibraryPath] +Count=5 +Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib +Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + +[HistoryLists\hlDebugSourcePath] +Count=1 +Item0=$(BCB)\source\vcl + +[HistoryLists\hlConditionals] +Count=1 +Item0=_DEBUG + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=Gen1:1 +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Compiler] +ShowInfoMsgs=0 +LinkDebugVcl=0 +LinkCGLIB=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + \ No newline at end of file diff --git a/utilities/bcppmake/xml2gbs.bdsproj b/utilities/bcppmake/xml2gbs.bdsproj index d2d4ea3..5e7b4d2 100644 --- a/utilities/bcppmake/xml2gbs.bdsproj +++ b/utilities/bcppmake/xml2gbs.bdsproj @@ -1,319 +1,319 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - 4 - ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl - ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl - - - 5 - ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib - ..\;..;$(BCB)\lib\obj;$(BCB)\lib - ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib - - - 1 - $(BCB)\source\vcl - - - 3 - _ICU_;_ICUSWORD_ - _ICU_;_ICUSWORD_;_DEBUG - _DEBUG - - - $(BCB)\source\vcl - - - summatheologica.xml - - False - - - - - - - False - - False - - True - False - - - - $00000000 - - - - - - - - - - - xml2gbs.bpf - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 4 + ..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..;..\..\include;$(BCB)\include;$(BCB)\include\vcl + ..\..\utilities;$(BCB)\include;$(BCB)\include\vcl + + + 5 + ..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib + ..\;..;$(BCB)\lib\obj;$(BCB)\lib + ..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + ..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib + + + 1 + $(BCB)\source\vcl + + + 3 + _ICU_;_ICUSWORD_ + _ICU_;_ICUSWORD_;_DEBUG + _DEBUG + + + $(BCB)\source\vcl + + + summatheologica.xml + + False + + + + + + + False + + False + + True + False + + + + $00000000 + + + + + + + + + + + xml2gbs.bpf + + + diff --git a/utilities/cipherraw.cpp b/utilities/cipherraw.cpp deleted file mode 100644 index a8de3e7..0000000 --- a/utilities/cipherraw.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/****************************************************************************** - * - * cipherraw.cpp - Utility to encipher a raw (uncompressed) module - * - * $Id: cipherraw.cpp 2833 2013-06-29 06:40:28Z chrislit $ - * - * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifdef _MSC_VER - #pragma warning( disable: 4251 ) - #pragma warning( disable: 4996 ) -#endif - -#include -#include -#include -#include -#include -#include -#include - -#ifndef __GNUC__ -#include -#else -#include -#endif - -#include -#include -#include -#include -#include - -#ifndef NO_SWORD_NAMESPACE -using namespace sword; -#endif - -int main(int argc, char **argv) { - SWCipher *zobj; - VerseKey key; - RawVerse *rawdrv; - int ofd[2], oxfd[2]; - long tmpoff = 0, offset, loffset = 0, lzoffset = 0; - unsigned short size, lsize = 0, lzsize; - char *tmpbuf; - - if (argc != 3) { - fprintf(stderr, "usage: %s \"\"\n", argv[0]); - exit(1); - } - - rawdrv = new RawVerse(argv[1]); - zobj = new SWCipher((unsigned char *)argv[2]); - - tmpbuf = new char [ strlen(argv[1]) + 11 ]; - sprintf(tmpbuf, "%sot.zzz", argv[1]); - ofd[0] = FileMgr::createPathAndFile(tmpbuf); - sprintf(tmpbuf, "%sot.zzz.vss", argv[1]); - oxfd[0] = FileMgr::createPathAndFile(tmpbuf); - sprintf(tmpbuf, "%snt.zzz", argv[1]); - ofd[1] = FileMgr::createPathAndFile(tmpbuf); - sprintf(tmpbuf, "%snt.zzz.vss", argv[1]); - oxfd[1] = FileMgr::createPathAndFile(tmpbuf); - - delete [] tmpbuf; - - printf("\n"); - write(oxfd[0], &lzoffset, 4); - write(oxfd[0], &lzsize, 2); - write(oxfd[1], &lzoffset, 4); - write(oxfd[1], &lzsize, 2); - - key.setAutoNormalize(false); - key.setIntros(true); - for (key.setIndex(0); (!key.popError()); key++) { - rawdrv->findOffset(key.getTestament(), key.getIndex(), &offset, &size); - printf("%s: OLD offset: %ld; size: %d\n", (const char *)key, offset, size); - - if ((offset == loffset) && (size == lsize)) { - printf("using previous offset,size %d\n", size); - offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR); - printf("%ld %ld %d \n", offset, lzoffset, lzsize); - write(oxfd[key.getTestament() - 1], &lzoffset, 4); - write(oxfd[key.getTestament() - 1], &lzsize, 2); - } - else { - lsize = size; - loffset = offset; - - if (size) { - SWBuf tmpbuf; - rawdrv->readText(key.getTestament(), offset, size, tmpbuf); - zobj->Buf(tmpbuf.c_str(), size); - unsigned long ulSize = size; - zobj->cipherBuf(&ulSize); - size = (unsigned int)ulSize; - } - offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR); - tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR); - printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size); - write(oxfd[key.getTestament() - 1], &offset, 4); - unsigned long ulSize = size; - if (size) - write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size); - size = (unsigned int)ulSize; - lzoffset = offset; - write(oxfd[key.getTestament() - 1], &size, 2); - lzsize = size; - } - } - delete zobj; - close(ofd[0]); - close(oxfd[0]); - close(ofd[1]); - close(oxfd[1]); - return 0; -} diff --git a/utilities/diatheke/CMakeLists.txt b/utilities/diatheke/CMakeLists.txt new file mode 100644 index 0000000..ab11cb1 --- /dev/null +++ b/utilities/diatheke/CMakeLists.txt @@ -0,0 +1,24 @@ +#################################################################### +# And, of course, diatheke is a beast unto itself +# +# Let's go! +# +ADD_EXECUTABLE(diatheke + diatheke.cpp + corediatheke.cpp + diathekemgr.cpp + diafiltmgr.cpp + thmlcgi.cpp + gbfcgi.cpp + osiscgi.cpp +) +IF(BUILDING_SHARED) + TARGET_LINK_LIBRARIES(diatheke sword) +ELSE(BUILDING_SHARED) + TARGET_LINK_LIBRARIES(diatheke sword_static) +ENDIF(BUILDING_SHARED) +INSTALL(TARGETS diatheke + DESTINATION "${BINDIR}" + COMPONENT utilities +) + diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in index 4eee050..722cfff 100644 --- a/utilities/diatheke/Makefile.in +++ b/utilities/diatheke/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -324,9 +324,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_bzip2 = @with_bzip2@ with_conf = @with_conf@ with_icu = @with_icu@ with_icusword = @with_icusword@ +with_xz = @with_xz@ with_zlib = @with_zlib@ AUTOMAKE_OPTIONS = 1.6 LDADD = $(top_builddir)/lib/libsword.la diff --git a/utilities/diatheke/README b/utilities/diatheke/README index df39d86..483118d 100644 --- a/utilities/diatheke/README +++ b/utilities/diatheke/README @@ -47,12 +47,17 @@ default page to create a custom index.html for your users. ---------------------------------------------------------------------- VERSION HISTORY -4.7 +4.7 ..., 2014 + Updated for Sword 1.8.0. + Supports LaTeX, XHTML, & WEBIF output. + Supports outputting SCSU-encoded text. + Added 'internal' output format, which applies no formatting + filtes--useful for debugging & diagnostics. 4.6 July 16, 2013 Updated for Sword 1.7.0. -4.5 +4.5 4.0 July 8, 2001 Updated to Sword 1.5.2 with innumerable bug fixes. diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp index de5b26c..6221604 100644 --- a/utilities/diatheke/corediatheke.cpp +++ b/utilities/diatheke/corediatheke.cpp @@ -2,7 +2,7 @@ * * corediatheke.cpp - * - * $Id: corediatheke.cpp 3245 2014-07-19 21:09:06Z greg.hellings $ + * $Id: corediatheke.cpp 3446 2017-02-28 17:54:34Z refdoc $ * * Copyright 2001-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -43,14 +43,13 @@ void systemquery(const char * key, ostream* output){ SWModule *target; - bool types = false, descriptions = false, names = false; + bool types = false, descriptions = false, names = false, bibliography = false; if (!::stricmp(key, "localelist")) { LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr(); list loclist = lm->getAvailableLocales(); - list::iterator li = loclist.begin(); - for (;li != loclist.end(); li++) { - *output << li->c_str() << endl; + for (list::iterator li = loclist.begin(); li != loclist.end(); ++li) { + *output << li->c_str() << endl; } } else if (!::stricmp(key, "modulelist")) { @@ -64,71 +63,57 @@ void systemquery(const char * key, ostream* output){ else if (!::stricmp(key, "modulelistdescriptions")) { descriptions = true; } + else if (!::stricmp(key, "bibliography")) { + types = true; + names = true; + bibliography = true; + } + if (types || descriptions || names || bibliography) { + const char *modTypes[] = { + SWMgr::MODTYPE_BIBLES, + SWMgr::MODTYPE_COMMENTARIES, + SWMgr::MODTYPE_LEXDICTS, + SWMgr::MODTYPE_DAILYDEVOS, + SWMgr::MODTYPE_GENBOOKS, + 0 + }; + + for (int i = 0; modTypes[i]; ++i) { - if (types || descriptions || names) { - if (types) *output << "Biblical Texts:\n"; - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - target = it->second; - if (!strcmp(target->getType(), "Biblical Texts")) { - if (names) *output << target->getName(); - if (names && descriptions) *output << " : "; - if (descriptions) *output << target->getDescription(); - *output << endl; - } - } - if (types) *output << "Commentaries:\n"; - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - target = it->second; - if (!strcmp(target->getType(), "Commentaries")) { - if (names) *output << target->getName(); - if (names && descriptions) *output << " : "; - if (descriptions) *output << target->getDescription(); - *output << endl; - } - } - if (types) *output << "Dictionaries:\n"; - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - target = it->second; - if (!strcmp(target->getType(), "Lexicons / Dictionaries")) { - if (names) *output << target->getName(); - if (names && descriptions) *output << " : "; - if (descriptions) *output << target->getDescription(); - *output << endl; - } - } - if (types) *output << "Generic books:\n"; - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - target = it->second; - if (!strcmp(target->getType(), "Generic Books")) { - if (names) *output << target->getName(); - if (names && descriptions) *output << " : "; - if (descriptions) *output << target->getDescription(); - *output << endl; + if (types) *output << modTypes[i] << ":\n"; + for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { + target = it->second; + if (!strcmp(target->getType(), modTypes[i])) { + if (names) *output << target->getName(); + if (names && (descriptions || bibliography)) *output << " : "; + if (descriptions) *output << target->getDescription(); + if (bibliography) *output << target->getBibliography(); + *output << endl; + } } } } } + void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed char variants = 0) { - static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat, - ((OP_BIDI & optionfilters) == OP_BIDI), - ((OP_ARSHAPE & optionfilters) == OP_ARSHAPE)); - ModMap::iterator it; + static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat, ((OP_BIDI & optionfilters) == OP_BIDI), ((OP_ARSHAPE & optionfilters) == OP_ARSHAPE)); + ListKey listkey; - SectionMap::iterator sit; - ConfigEntMap::iterator eit; + const char *DEFAULT_FONT = "Gentium"; SWModule *target; - char *font = 0; + const char *font = 0; SWBuf modlanguage; SWBuf modlocale; SWBuf syslanguage; SWBuf syslocale; + SWBuf header; + char inputformat = 0; - SWBuf encoding; char querytype = 0; if (!locale) { locale = "en"; @@ -152,80 +137,45 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI text = ref; } //otherwise, we have a real book - it = manager.Modules.find(text); - if (it == manager.Modules.end()) { //book not found - return; - } - target = (*it).second; - SWKey *p = target->createKey(); - VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); - - + target = manager.getModule(text); + if (!target) return; + if (target->getLanguage()) { modlocale = target->getLanguage(); LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr(); modlanguage = lm->translate(modlocale.append(".en"), "locales"); modlocale -= 3; - } + } else { modlocale = "en"; modlanguage = "English"; - } + } - if (!parser) { - delete p; - parser = new VerseKey(); - } - if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) { - if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) { - if (!::stricmp((char *)(*eit).second.c_str(), "GBF")) - inputformat = FMT_GBF; - else if (!::stricmp((char *)(*eit).second.c_str(), "ThML")) - inputformat = FMT_THML; - else if (!::stricmp((char *)(*eit).second.c_str(), "OSIS")) - inputformat = FMT_OSIS; - else if (!::stricmp((char *)(*eit).second.c_str(), "TEI")) - inputformat = FMT_TEI; - } - encoding = ((eit = (*sit).second.find("Encoding")) != (*sit).second.end()) ? (*eit).second : (SWBuf)""; - } + SWBuf sourceType = target->getConfigEntry("SourceType"); + if (sourceType == "GBF") inputformat = FMT_GBF; + else if (sourceType == "ThML") inputformat = FMT_THML; + else if (sourceType == "OSIS") inputformat = FMT_OSIS; + else if (sourceType == "TEI") inputformat = FMT_TEI; + + SWBuf encoding = target->getConfigEntry("Encoding"); if (querytype == QT_INFO) { - switch (inputformat) { - case FMT_THML : - *output << "ThML"; - break; - case FMT_GBF : - *output << "GBF"; - break; - case FMT_OSIS : - *output << "OSIS"; - break; - case FMT_TEI : - *output << "TEI"; - break; - default: - *output << "Other"; - } - *output << ";"; - *output << target->getType(); - *output << ";"; - delete parser; - return; + switch (inputformat) { + case FMT_THML : *output << "ThML"; break; + case FMT_GBF : *output << "GBF" ; break; + case FMT_OSIS : *output << "OSIS"; break; + case FMT_TEI : *output << "TEI" ; break; + default: *output << "Other"; + } + *output << ";"; + *output << target->getType(); + *output << ";"; + return; } - if (searchtype) - querytype = QT_SEARCH; - else if (!strcmp(target->getType(), "Biblical Texts")) - querytype = QT_BIBLE; - else if (!strcmp(target->getType(), "Commentaries")) - querytype = QT_COMM; - else if (!strcmp(target->getType(), "Lexicons / Dictionaries")) - querytype = QT_LD; - else if (!strcmp(target->getType(), "Generic Books")) - querytype = QT_LD; + if (searchtype) querytype = QT_SEARCH; manager.setGlobalOption("Footnotes", (optionfilters & OP_FOOTNOTES) ? "On": "Off"); manager.setGlobalOption("Headings", (optionfilters & OP_HEADINGS) ? "On": "Off"); @@ -241,8 +191,11 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI manager.setGlobalOption("Glosses", (optionfilters & OP_GLOSSES) ? "On": "Off"); manager.setGlobalOption("Transliterated Forms", (optionfilters & OP_XLIT) ? "On": "Off"); manager.setGlobalOption("Enumerations", (optionfilters & OP_ENUM) ? "On": "Off"); - + manager.setGlobalOption("Morpheme Segmentation", (optionfilters & OP_MORPHSEG) ? "On": "Off"); manager.setGlobalOption("Transliteration", (optionfilters & OP_TRANSLITERATOR && script) ? script : "Off"); + + VerseKey *parser = (SWDYNAMIC_CAST(VerseKey, target->getKey())) ? (VerseKey *)target->createKey() : 0; + if (parser && (optionfilters & OP_INTROS)) { parser->setIntros(true); ((VerseKey *)target->getKey())->setIntros(true); } if ((optionfilters & OP_VARIANTS) && variants) { @@ -251,112 +204,180 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI else if (variants == 1) manager.setGlobalOption("Textual Variants", "Secondary Reading"); } - else - manager.setGlobalOption("Textual Variants", "Primary Reading"); + else manager.setGlobalOption("Textual Variants", "Primary Reading"); if (querytype == QT_SEARCH) { - - //this test is just to determine if we've got SWKeys or VerseKeys - if (!strcmp(target->getType(), "Biblical Texts")) - querytype = QT_BIBLE; - else if (!strcmp(target->getType(), "Commentaries")) - querytype = QT_BIBLE; - else if (!strcmp(target->getType(), "Lexicons / Dictionaries")) - querytype = QT_LD; - else if (!strcmp(target->getType(), "Generic Books")) - querytype = QT_LD; - //do search stuff char st = 1 - searchtype; if (querytype == QT_BIBLE) { - *output << "Verses containing \""; + *output << "Verses containing \""; } - else *output << "Entries containing \""; + else *output << "Entries containing \""; *output << ref; *output << "\"-- "; - if (range) { + if (range && parser) { ListKey scope = parser->parseVerseList(range, "Gen 1:1", true); listkey = target->search(ref, st, REG_ICASE, &scope); } else listkey = target->search(ref, st, REG_ICASE); - if (strlen((const char*)listkey)) { - if (!listkey.popError()) { - if (outputformat == FMT_CGI) *output << ""; - if (querytype == QT_BIBLE) { - *parser = listkey; - *output << (const char *)*parser; - } - else *output << (const char *)listkey; - if (outputformat == FMT_CGI) *output << ""; - } - listkey++; - while (!listkey.popError()) { - *output << " ; "; - if (outputformat == FMT_CGI) *output << ""; - if (querytype == QT_BIBLE) { - *parser = listkey; - *output << (const char *)*parser; - } - else *output << (const char *)listkey; - if (outputformat == FMT_CGI) *output << ""; - listkey++; - } - *output << " -- "; - - char *temp = new char[10]; - sprintf(temp, "%u", listkey.getCount()); - *output << temp; - delete [] temp; - - *output << " matches total ("; - *output << target->getName(); - *output << ")\n"; + bool first = true; + if (listkey.getCount()) { + for (listkey = TOP; !listkey.popError(); listkey++) { + if (!listkey.popError()) { + if (outputformat == FMT_CGI) *output << ""; + *output << listkey.getText(); + if (outputformat == FMT_CGI) *output << ""; + } + if (first) first = false; + else *output << " ; "; + } + *output << " -- "; + + *output << listkey.getCount() << " matches total ("; } else { - *output << "none ("; - *output << target->getName(); - *output << ")\n"; + *output << "none ("; } + *output << target->getName(); + *output << ")\n"; } + else { - else if (querytype == QT_LD) { - //do dictionary stuff - - target->setKey(ref); - - SWBuf text = target->renderText(); + if (parser) { + listkey = parser->parseVerseList(ref, "Gen1:1", true); + } + else listkey << ref; + + font = target->getConfigEntry("Font"); + if (!font) font = DEFAULT_FONT; if (outputformat == FMT_RTF) { *output << "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\fdecor\\fprq2 "; - if (font) - *output << font; - else - *output << "Times New Roman"; - *output << ";}}"; + *output << font; + *output << ";}{\\f7\\froman\\fcharset2\\fprq2 Symbol;}}"; } + + else if (outputformat == FMT_LATEX) { + *output << "\\documentclass{bibletext}\n" + "\\usepackage{sword}\n" + "\\title{" << target->getDescription() << " \\\\\\small " << ref << "}\n"; + + if (syslanguage.size()) { + syslanguage[0] = tolower(syslanguage[0]); + *output << "\\setmainlanguage{" << syslanguage << "}\n"; + } + + if (modlanguage.size()) { + modlanguage[0] = tolower(modlanguage[0]); + } + else { + modlanguage = "english"; + } + + if (!(modlanguage == syslanguage)) { + *output << "\\setotherlanguage{" << modlanguage << "}\n"; + } + + + *output << "\\date{}\n" + "\\begin{document}\n" + "\\maketitle\n"; + + if (!(modlanguage == syslanguage)) { + *output << "\\begin{" << modlanguage << "}\n"; + } + } + + else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) { - *output << ""; + *output << "\n" + ""; + } + for (listkey = TOP; !listkey.popError() && maxverses; listkey++) { + target->setKey(listkey); + VerseKey *vk = SWDYNAMIC_CAST(VerseKey, target->getKey()); + + // if we've got a VerseKey (Bible or Commentary) + if (vk) { + // let's do some special processing if we're at verse 1 + if (vk->getVerse() == 1) { + if (vk->getChapter() == 1) { + if (vk->getBook() == 1) { + if (vk->getTestament() == 1) { + // MODULE START SPECIAL PROCESSING + if (outputformat == FMT_LATEX) + { *output << "\\swordmodule\n"; + // put your latex module start stuff here + } + } + // TESTAMENT START SPECIAL PROCESSING + if (outputformat == FMT_LATEX) { + // put your latex testament start stuff here + *output << "\\swordtestament\n"; + } + } + // BOOK START SPECIAL PROCESSING + if (outputformat == FMT_LATEX) { + // put your latex book start stuff here + *output << "\\swordbook\n"; + } + } + // CHAPTER START SPECIAL PROCESSING + if (outputformat == FMT_LATEX) { + *output << "\n\\swordchapter{" + << vk->getOSISRef() << "}{" + << vk->getText() << "}{" + << vk->getChapter() << "}"; + } + } - if (text.length()) { - *output << (char*)target->getKeyText(); - *output << (char*)target->getKeyText(); - if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { - *output << ": "; + // PREVERSE MATTER + header = target->getEntryAttributes()["Heading"]["Preverse"]["0"]; + *output << target->renderText(header); + + // VERSE PROCESSING + if (outputformat == FMT_LATEX) { + *output << "\\swordverse{" + << vk->getOSISRef() << "}{" + << vk->getText() << "}{" + << vk->getVerse() << "} "; + } + // no special format processing default: just show the key + else { + *output << target->getKeyText(); + } + } + // if we're not a VerseKey, then simply output the key + else { + *output << target->getKeyText(); + } + + // OUTPUT RENDER ENTRY + if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { + *output << ": "; } else if (outputformat == FMT_RTF) { *output << ": {\\f1 "; } + else if (outputformat == FMT_LATEX) { + *output << " "; + } else { *output << ": "; } - *output << text; + + *output << target->renderText(); + + if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { *output << ""; } @@ -364,138 +385,46 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "}"; } - *output << "(" << target->getName() << ")\n"; - } - - if (outputformat == FMT_RTF) { - *output << "}"; - } - - } + if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) + *output << "
"; + else if (outputformat == FMT_OSIS) + *output << ""; + else if (outputformat == FMT_RTF) + *output << "\\par "; + else if (outputformat == FMT_GBF) + *output << ""; - else if (querytype == QT_BIBLE || querytype == QT_COMM) { - //do commentary/Bible stuff - - if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) { - if ((eit = (*sit).second.find("Font")) != (*sit).second.end()) { - font = (char *)(*eit).second.c_str(); - if (strlen(font) == 0) font = 0; - } - } + *output << "\n"; - listkey = parser->parseVerseList(ref, "Gen1:1", true); - int i; - - if (outputformat == FMT_RTF) { - *output << "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\fdecor\\fprq2 "; - if (font) - *output << font; - else - *output << "Times New Roman"; - *output << ";}{\\f7\\froman\\fcharset2\\fprq2 Symbol;}}"; - } - else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) { - *output << ""; + maxverses--; } - for (i = 0; i < listkey.getCount() && maxverses; i++) { - VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i)); - if (element && element->isBoundSet()) { - target->setKey(element->getLowerBound()); - *parser = element->getUpperBound(); - while (maxverses && *target->getKey() <= *parser) { - *output << (char*)target->getKeyText(); - if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { - *output << ": "; - } - if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { - *output << ": "; - } - else if (outputformat == FMT_RTF) { - *output << ": {\\f1 "; - } - else { - *output << ": "; - } - *output << target->renderText(); - if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { - *output << ""; - } - else if (outputformat == FMT_RTF) { - *output << "}"; - } - - if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) - *output << "
"; - else if (outputformat == FMT_OSIS) - *output << ""; - else if (outputformat == FMT_RTF) - *output << "\\par "; - else if (outputformat == FMT_GBF) - *output << ""; - - *output << "\n"; - - if (*target->getKey() == *parser) - break; - maxverses--; - (*target)++; - } - } - else { - target->setKey(*listkey.getElement(i)); - *output << (char*)target->getKeyText(); - if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { - *output << ": "; - } - - if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { - *output << ": "; - } - else if (outputformat == FMT_RTF) { - *output << ": {\\f1 "; - } - else { - *output << ": "; - } - *output << target->renderText(); - if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { - *output << ""; - } - else if (outputformat == FMT_RTF) { - *output << "}"; - } - - if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) - *output << "
"; - else if (outputformat == FMT_OSIS) - *output << ""; - else if (outputformat == FMT_RTF) - *output << "\\par "; - else if (outputformat == FMT_GBF) - *output << ""; - - *output << "\n"; - maxverses--; - } + if ((outputformat == FMT_LATEX) && (!(modlanguage == syslanguage))) { + *output << "\\end{" << modlanguage << "}\n"; } *output << "("; *output << target->getName(); + + if (outputformat == FMT_LATEX) { + *output << ", "; + *output << target->getConfigEntry("DistributionLicense"); + + } + *output << ")\n"; if (outputformat == FMT_RTF) { *output << "}"; } - + else if (outputformat == FMT_LATEX) { + *output << "\\end{document}\n"; + } + else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) { + *output << "\n"; + } } - + delete parser; } + diff --git a/utilities/diatheke/corediatheke.h b/utilities/diatheke/corediatheke.h index cac0845..98b3bb5 100644 --- a/utilities/diatheke/corediatheke.h +++ b/utilities/diatheke/corediatheke.h @@ -2,7 +2,7 @@ * * corediatheke.h - * - * $Id: corediatheke.h 3189 2014-04-17 05:00:28Z greg.hellings $ + * $Id: corediatheke.h 3359 2015-03-22 23:31:43Z refdoc $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -58,6 +58,8 @@ #define OP_GLOSSES (1<<15) #define OP_XLIT (1<<16) #define OP_ENUM (1<<17) +#define OP_MORPHSEG (1<<18) +#define OP_INTROS (1<<19) #define ST_NONE 0 #define ST_REGEX 1 // 0 diff --git a/utilities/diatheke/diafiltmgr.cpp b/utilities/diatheke/diafiltmgr.cpp index be091a9..564896e 100644 --- a/utilities/diatheke/diafiltmgr.cpp +++ b/utilities/diatheke/diafiltmgr.cpp @@ -2,7 +2,7 @@ * * diafiltmgr.cpp - DiathekeFilterMgr * - * $Id: diafiltmgr.cpp 2843 2013-06-29 11:22:27Z chrislit $ + * $Id: diafiltmgr.cpp 3113 2014-03-12 12:42:07Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -20,24 +20,42 @@ * */ +#include +#include + #include -#include #include -#include +#include #include -#include #include -#include +#include +#include #include +#include + +#include +#include +#include +#include +#include +#include +#include #include +#include + +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include -#include +#include +#include +#include +#include +#include #include "diafiltmgr.h" #include "thmlcgi.h" @@ -61,6 +79,8 @@ DiathekeFilterMgr::~DiathekeFilterMgr() { delete (fromplain); if (fromosis) delete (fromosis); + if (fromtei) + delete (fromtei); } void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { @@ -81,6 +101,10 @@ void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion if (fromosis) module->addRenderFilter(fromosis); break; + case FMT_TEI: + if (fromtei) + module->addRenderFilter(fromtei); + break; } EncodingFilterMgr::AddRenderFilters(module, section); } @@ -95,6 +119,7 @@ char DiathekeFilterMgr::Markup(char mark) { SWFilter * oldthml = fromthml; SWFilter * oldgbf = fromgbf; SWFilter * oldosis = fromosis; + SWFilter * oldtei = fromtei; CreateFilters(markup); @@ -160,6 +185,21 @@ char DiathekeFilterMgr::Markup(char mark) { } break; } + case FMT_TEI: + if (oldtei != fromtei) { + if (oldtei) { + if (!fromtei) { + module->second->removeRenderFilter(oldtei); + } + else { + module->second->replaceRenderFilter(oldtei, fromtei); + } + } + else if (fromtei) { + module->second->addRenderFilter(fromtei); + } + break; + } } if (oldthml) @@ -170,6 +210,8 @@ char DiathekeFilterMgr::Markup(char mark) { delete oldplain; if (oldosis) delete oldosis; + if (oldtei) + delete oldtei; } return markup; } @@ -177,54 +219,109 @@ char DiathekeFilterMgr::Markup(char mark) { void DiathekeFilterMgr::CreateFilters(char markup) { switch (markup) { + case FMT_INTERNAL: + fromplain = NULL; + fromthml = NULL; + fromgbf = NULL; + fromosis = NULL; + fromtei = NULL; + break; + case FMT_CGI: fromplain = NULL; fromthml = new ThMLCGI(); fromgbf = new GBFCGI(); fromosis = new OSISCGI(); + fromtei = NULL; // TODO: write TEICGI() + break; + + case FMT_PLAIN: + fromplain = NULL; + fromthml = new ThMLPlain(); + fromgbf = new GBFPlain(); + fromosis = new OSISPlain(); + fromtei = new TEIPlain(); + break; + + case FMT_THML: + fromplain = NULL; + fromthml = NULL; + fromgbf = new GBFThML(); + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_GBF: + fromplain = NULL; + fromthml = new ThMLGBF(); + fromgbf = NULL; + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_HTML: + fromplain = NULL; + fromthml = new ThMLHTML(); + fromgbf = new GBFHTML(); + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_HTMLHREF: + fromplain = NULL; + fromthml = new ThMLHTMLHREF(); + fromgbf = new GBFHTMLHREF(); + fromosis = new OSISHTMLHREF(); + fromtei = new TEIHTMLHREF(); + break; + + case FMT_RTF: + fromplain = NULL; + fromthml = new ThMLRTF(); + fromgbf = new GBFRTF(); + fromosis = new OSISRTF(); + fromtei = new TEIRTF(); + break; + + case FMT_LATEX: + fromplain = NULL; + fromthml = new ThMLLaTeX(); + fromgbf = new GBFLaTeX(); + fromosis = new OSISLaTeX(); + fromtei = new TEILaTeX(); + break; + + case FMT_OSIS: + fromplain = NULL; + fromthml = new ThMLOSIS(); + fromgbf = new GBFOSIS(); + fromosis = new OSISOSIS(); + fromtei = NULL; + break; + + case FMT_WEBIF: + fromplain = NULL; + fromthml = new ThMLWEBIF(); + fromgbf = new GBFWEBIF(); + fromosis = new OSISWEBIF(); + fromtei = NULL; + break; + + case FMT_TEI: + fromplain = NULL; + fromthml = NULL; + fromgbf = NULL; + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_XHTML: + fromplain = NULL; + fromthml = new ThMLXHTML(); + fromgbf = new GBFXHTML(); + fromosis = new OSISXHTML(); + fromtei = new TEIXHTML(); break; - case FMT_PLAIN: - fromplain = NULL; - fromthml = new ThMLPlain(); - fromgbf = new GBFPlain(); - fromosis = new OSISPlain(); - break; - case FMT_THML: - fromplain = NULL; - fromthml = NULL; - fromgbf = new GBFThML(); - fromosis = NULL; - break; - case FMT_GBF: - fromplain = NULL; - fromthml = new ThMLGBF(); - fromgbf = NULL; - fromosis = NULL; - break; - case FMT_HTML: - fromplain = NULL; - fromthml = new ThMLHTML(); - fromgbf = new GBFHTML(); - fromosis = NULL; - break; - case FMT_HTMLHREF: - fromplain = NULL; - fromthml = new ThMLHTMLHREF(); - fromgbf = new GBFHTMLHREF(); - fromosis = new OSISHTMLHREF(); - break; - case FMT_RTF: - fromplain = NULL; - fromthml = new ThMLRTF(); - fromgbf = new GBFRTF(); - fromosis = new OSISRTF(); - break; - case FMT_OSIS: - fromplain = NULL; - fromthml = new ThMLOSIS(); - fromgbf = new GBFOSIS(); - fromosis = NULL; - break; } } diff --git a/utilities/diatheke/diafiltmgr.h b/utilities/diatheke/diafiltmgr.h index 120fc6e..c6d5dd0 100644 --- a/utilities/diatheke/diafiltmgr.h +++ b/utilities/diatheke/diafiltmgr.h @@ -2,7 +2,7 @@ * * diafiltmgr.h - DiathekeFilterMgr * - * $Id: diafiltmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: diafiltmgr.h 3113 2014-03-12 12:42:07Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,6 +24,7 @@ #define DIAFILTMGR_H #define FMT_CGI 127 +#define FMT_INTERNAL 126 #include @@ -37,6 +38,7 @@ protected: SWFilter* fromgbf; SWFilter* fromplain; SWFilter* fromosis; + SWFilter* fromtei; char markup; diff --git a/utilities/diatheke/diatheke.cpp b/utilities/diatheke/diatheke.cpp index 1649169..83f30ff 100644 --- a/utilities/diatheke/diatheke.cpp +++ b/utilities/diatheke/diatheke.cpp @@ -2,7 +2,7 @@ * * diatheke.cpp - * - * $Id: diatheke.cpp 3170 2014-04-17 04:14:38Z greg.hellings $ + * $Id: diatheke.cpp 3450 2017-02-28 23:28:03Z refdoc $ * * Copyright 1999-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -47,22 +47,25 @@ void printsyntax() { fprintf (stderr, " [-l locale] <-k query_key>\n"); fprintf (stderr, "\n"); fprintf (stderr, "If is \"system\" you may use these system keys: \"modulelist\",\n"); - fprintf (stderr, "\"modulelistnames\", and \"localelist\"."); + fprintf (stderr, "\"modulelistnames\", \"bibliography\", and \"localelist\"."); fprintf (stderr, "\n"); - fprintf (stderr, "Valid search_type values are: phrase (default), regex, multiword,\n"); - fprintf (stderr, " attribute, lucene, multilemma.\n"); + fprintf (stderr, "Valid search_type values are: phrase , regex, multiword, attribute,\n"); + fprintf (stderr, " lucene, multilemma.\n"); fprintf (stderr, "Valid (output) option_filters values are: n (Strong's numbers),\n"); fprintf (stderr, " f (Footnotes), m (Morphology), h (Section Headings),\n"); fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n"); fprintf (stderr, " l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping),\n"); fprintf (stderr, " b (Bi-Directional Reordering), w (Red Words of Christ),\n"); - fprintf (stderr, " g (Glosses/Ruby), e (Word Enumerations),\n"); - fprintf (stderr, " x (Encoded Transliterations), t (Algorithmic Transliterations via ICU)\n"); + fprintf (stderr, " g (Glosses/Ruby), e (Word Enumerations), i (Intros)\n"); + fprintf (stderr, " x (Encoded Transliterations), t (Algorithmic Transliterations via ICU),\n"); + fprintf (stderr, " M (morpheme segmentation)\n"); fprintf (stderr, "Maximum verses may be any integer value\n"); - fprintf (stderr, "Valid output_format values are: GBF, ThML, RTF, HTML, HTMLHREF, XHTML, OSIS,\n"); - fprintf (stderr, " CGI, and plain (def)\n"); - fprintf (stderr, "Valid output_encoding values are: Latin1, UTF8 (def), UTF16, HTML, and RTF\n"); + fprintf (stderr, "Valid output_format values are: CGI, GBF, HTML, HTMLHREF, LaTeX, OSIS, RTF,\n"); + fprintf (stderr, " ThML, WEBIF, XHTML, plain, and internal (def)\n"); + fprintf (stderr, "The option LaTeX will produce a compilable document, but may well require\n"); + fprintf (stderr, " tweaking to be usable.\n"); + fprintf (stderr, "Valid output_encoding values are: Latin1, UTF8 (def), UTF16, HTML, RTF, and SCSU\n"); fprintf (stderr, "Valid locale values depend on installed locales. en is default.\n"); fprintf (stderr, "The query_key must be the last argument because all following\n"); fprintf (stderr, " arguments are added to the key.\n"); @@ -78,7 +81,7 @@ void printsyntax() { int main(int argc, char **argv) { int maxverses = -1; - unsigned char outputformat = FMT_PLAIN, searchtype = ST_NONE, outputencoding = ENC_UTF8; + unsigned char outputformat = FMT_INTERNAL, searchtype = ST_NONE, outputencoding = ENC_UTF8; unsigned long optionfilters = OP_NONE; char *text = 0, *locale = 0, *ref = 0, *range = 0; char script[] = "Latin"; // for the moment, only this target script is supported @@ -87,17 +90,17 @@ int main(int argc, char **argv) char runquery = 0; // used to check that we have enough arguments to perform a legal query // (a querytype & text = 1 and a ref = 2) - for (int i = 1; i < argc; i++) { + for (int i = 1; i < argc; ++i) { if (!::stricmp("-b", argv[i])) { if (i+1 <= argc) { - text = argv[i+1]; - i++; + ++i; + text = argv[i]; runquery |= RQ_BOOK; } } else if (!::stricmp("-s", argv[i])) { if (i+1 <= argc) { - i++; + ++i; if (!::stricmp("phrase", argv[i])) { searchtype = ST_PHRASE; } @@ -125,129 +128,135 @@ int main(int argc, char **argv) } else if (!::stricmp("-r", argv[i])) { if (i+1 <= argc) { - range = argv[i+1]; - i++; + ++i; + range = argv[i]; } } else if (!::stricmp("-l", argv[i])) { if (i+1 <= argc) { - locale = argv[i+1]; - i++; + ++i; + locale = argv[i]; } } else if (!::stricmp("-m", argv[i])) { if (i+1 <= argc) { - maxverses = atoi(argv[i+1]); - i++; + ++i; + maxverses = atoi(argv[i]); } } else if (!::stricmp("-o", argv[i])) { if (i+1 <= argc) { - if (strchr(argv[i+1], 'f')) + ++i; + if (strchr(argv[i], 'f')) optionfilters |= OP_FOOTNOTES; - if (strchr(argv[i+1], 'n')) + if (strchr(argv[i], 'n')) optionfilters |= OP_STRONGS; - if (strchr(argv[i+1], 'h')) + if (strchr(argv[i], 'h')) optionfilters |= OP_HEADINGS; - if (strchr(argv[i+1], 'm')) + if (strchr(argv[i], 'm')) optionfilters |= OP_MORPH; - if (strchr(argv[i+1], 'c')) + if (strchr(argv[i], 'c')) optionfilters |= OP_CANTILLATION; - if (strchr(argv[i+1], 'v')) + if (strchr(argv[i], 'v')) optionfilters |= OP_HEBREWPOINTS; - if (strchr(argv[i+1], 'a')) + if (strchr(argv[i], 'a')) optionfilters |= OP_GREEKACCENTS; - if (strchr(argv[i+1], 'l')) + if (strchr(argv[i], 'l')) optionfilters |= OP_LEMMAS; - if (strchr(argv[i+1], 's')) + if (strchr(argv[i], 's')) optionfilters |= OP_SCRIPREF; - if (strchr(argv[i+1], 'r')) + if (strchr(argv[i], 'r')) optionfilters |= OP_ARSHAPE; - if (strchr(argv[i+1], 'b')) + if (strchr(argv[i], 'b')) optionfilters |= OP_BIDI; - if (strchr(argv[i+1], 'w')) + if (strchr(argv[i], 'w')) optionfilters |= OP_REDLETTERWORDS; - if (strchr(argv[i+1], 'p')) + if (strchr(argv[i], 'p')) optionfilters |= OP_ARABICPOINTS; - if (strchr(argv[i+1], 'g')) + if (strchr(argv[i], 'g')) optionfilters |= OP_GLOSSES; - if (strchr(argv[i+1], 'x')) + if (strchr(argv[i], 'x')) optionfilters |= OP_XLIT; - if (strchr(argv[i+1], 'e')) + if (strchr(argv[i], 'e')) optionfilters |= OP_ENUM; - if (strchr(argv[i+1], 't')) + if (strchr(argv[i], 'i')) + optionfilters |= OP_INTROS; + if (strchr(argv[i], 't')) optionfilters |= OP_TRANSLITERATOR; - i++; + if (strchr(argv[i], 'M')) + optionfilters |= OP_MORPHSEG; } } else if (!::stricmp("-f", argv[i])) { if (i+1 <= argc) { - if (!::stricmp("thml", argv[i+1])) { + ++i; + if (!::stricmp("thml", argv[i])) { outputformat = FMT_THML; - i++; } - else if (!::stricmp("cgi", argv[i+1])) { + else if (!::stricmp("cgi", argv[i])) { outputformat = FMT_CGI; - i++; } - else if (!::stricmp("gbf", argv[i+1])) { + else if (!::stricmp("gbf", argv[i])) { outputformat = FMT_GBF; - i++; } - else if (!::stricmp("htmlhref", argv[i+1])) { + else if (!::stricmp("htmlhref", argv[i])) { outputformat = FMT_HTMLHREF; - i++; } - else if (!::stricmp("html", argv[i+1])) { + else if (!::stricmp("html", argv[i])) { outputformat = FMT_HTML; - i++; } - else if (!::stricmp("xhtml", argv[i+1])) { + else if (!::stricmp("xhtml", argv[i])) { outputformat = FMT_XHTML; - i++; } - else if (!::stricmp("rtf", argv[i+1])) { + else if (!::stricmp("rtf", argv[i])) { outputformat = FMT_RTF; - i++; } - else if (!::stricmp("osis", argv[i+1])) { + else if (!::stricmp("osis", argv[i])) { outputformat = FMT_OSIS; - i++; } - else i++; + else if (!::stricmp("latex", argv[i])) { + outputformat = FMT_LATEX; + } + else if (!::stricmp("plain", argv[i])) { + outputformat = FMT_PLAIN; + } + else if (!::stricmp("webif", argv[i])) { + outputformat = FMT_WEBIF; + } + else if (!::stricmp("internal", argv[i])) { + outputformat = FMT_INTERNAL; + } } } else if (!::stricmp("-e", argv[i])) { if (i+1 <= argc) { - if (!::stricmp("utf8", argv[i+1])) { + ++i; + if (!::stricmp("utf8", argv[i])) { outputencoding = ENC_UTF8; - i++; } - else if (!::stricmp("rtf", argv[i+1])) { + else if (!::stricmp("rtf", argv[i])) { outputencoding = ENC_RTF; - i++; } - else if (!::stricmp("html", argv[i+1])) { + else if (!::stricmp("html", argv[i])) { outputencoding = ENC_HTML; - i++; } - else if (!::stricmp("latin1", argv[i+1])) { + else if (!::stricmp("latin1", argv[i])) { outputencoding = ENC_LATIN1; - i++; } - else if (!::stricmp("utf16", argv[i+1])) { + else if (!::stricmp("utf16", argv[i])) { outputencoding = ENC_UTF16; - i++; } - else i++; + else if (!::stricmp("scsu", argv[i])) { + outputencoding = ENC_SCSU; + } } } else if (!::stricmp("-k", argv[i])) { - i++; + ++i; if (i < argc) { SWBuf key = argv[i]; - i++; - for (; i < argc; i++) { + ++i; + for (; i < argc; ++i) { if (!::stricmp("-h", argv[i]) || !::stricmp("--help", argv[i])) printsyntax(); key = key + " " + argv[i]; @@ -260,17 +269,17 @@ int main(int argc, char **argv) } else if (!::stricmp("-v", argv[i])) { if (i+1 <= argc) { - variants = atoi(argv[i+1]); + ++i; + variants = atoi(argv[i]); optionfilters |= OP_VARIANTS; - i++; } } /* else if (!::stricmp("-t", argv[i])) { if (i+1 <= argc) { - script = argv[i+1]; + ++i; + script = argv[i]; optionfilters |= OP_TRANSLITERATOR; - i++; } } */ diff --git a/utilities/diatheke/diatheke.sln b/utilities/diatheke/diatheke.sln index 9d360da..361f0b9 100644 --- a/utilities/diatheke/diatheke.sln +++ b/utilities/diatheke/diatheke.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/utilities/diatheke/diatheke.vcxproj b/utilities/diatheke/diatheke.vcxproj index 7f698c1..cfd4ae1 100644 --- a/utilities/diatheke/diatheke.vcxproj +++ b/utilities/diatheke/diatheke.vcxproj @@ -1,198 +1,200 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {891A765C-5503-4FED-B427-7AE1413DB264} - - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - .\Debug/diatheke.tlb - - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/diatheke.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies) - .\Debug/diatheke.exe - true - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - .\Debug/diatheke.pdb - Console - false - - - MachineX86 - false - - - true - .\Debug/diatheke.bsc - - - - - .\Release/diatheke.tlb - - - - - MaxSpeed - OnlyExplicitInline - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release/diatheke.pch - .\Release/ - .\Release/ - .\Release/ - true - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies) - .\Release/diatheke.exe - true - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - .\Release/diatheke.pdb - Console - false - - - MachineX86 - - - true - .\Release/diatheke.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {891A765C-5503-4FED-B427-7AE1413DB264} + diatheke + + + + Application + false + MultiByte + v120 + + + Application + false + MultiByte + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\diatheke\Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + true + $(SolutionDir)..\diatheke\Release\ + $(SolutionDir)Release\$(ProjectName)\ + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + + .\Debug/diatheke.tlb + + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + .\Debug/diatheke.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies) + Debug/diatheke.exe + true + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + .\Debug/diatheke.pdb + Console + false + + + MachineX86 + false + + + true + .\Debug/diatheke.bsc + + + + + .\Release/diatheke.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/diatheke.pch + .\Release/ + .\Release/ + .\Release/ + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies) + Release/diatheke.exe + true + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + .\Release/diatheke.pdb + Console + false + + + MachineX86 + + + true + .\Release/diatheke.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + \ No newline at end of file diff --git a/utilities/diatheke/diathekemgr.cpp b/utilities/diatheke/diathekemgr.cpp index aa79fcf..0dc766d 100644 --- a/utilities/diatheke/diathekemgr.cpp +++ b/utilities/diatheke/diathekemgr.cpp @@ -2,7 +2,7 @@ * * diathekemgr.cpp - DiathekeMgr * - * $Id: diathekemgr.cpp 3167 2014-04-17 04:12:12Z greg.hellings $ + * $Id: diathekemgr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -47,7 +47,7 @@ DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autolo bidireorder = new UTF8BiDiReorder(); transliterator = new UTF8Transliterator(); #endif - Load(); + load(); #ifdef WIN32 OSVERSIONINFO osvi; @@ -73,7 +73,7 @@ DiathekeMgr::~DiathekeMgr() } -void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) +void DiathekeMgr::addRenderFilters(SWModule *module, ConfigEntMap §ion) { SWBuf lang; ConfigEntMap::iterator entry; @@ -91,11 +91,11 @@ void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) module->addRenderFilter(bidireorder); } #endif - SWMgr::AddRenderFilters(module, section); + SWMgr::addRenderFilters(module, section); } -signed char DiathekeMgr::Load () { - signed char retval = SWMgr::Load(); +signed char DiathekeMgr::load() { + signed char retval = SWMgr::load(); #ifdef _ICU_ optionFilters["UTF8Transliterator"] = transliterator; options.push_back(transliterator->getOptionName()); @@ -103,11 +103,9 @@ signed char DiathekeMgr::Load () { return retval; }; -void DiathekeMgr::AddGlobalOptions (SWModule * module, ConfigEntMap & section, - ConfigEntMap::iterator start, - ConfigEntMap::iterator end) { +void DiathekeMgr::addGlobalOptionFilters(SWModule *module, ConfigEntMap §ion) { - SWMgr::AddGlobalOptions(module, section, start, end); + SWMgr::addGlobalOptionFilters(module, section); #ifdef _ICU_ module->addOptionFilter(transliterator); #endif diff --git a/utilities/diatheke/diathekemgr.h b/utilities/diatheke/diathekemgr.h index 4ad7367..3a59f1c 100644 --- a/utilities/diatheke/diathekemgr.h +++ b/utilities/diatheke/diathekemgr.h @@ -2,7 +2,7 @@ * * diathekemgr.h - DiathekeMgr * - * $Id: diathekemgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: diathekemgr.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,9 +38,9 @@ class DiathekeMgr : public SWMgr { #endif protected: - virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion); - virtual signed char Load (); - virtual void AddGlobalOptions (SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end); + virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion); + virtual signed char load(); + virtual void addGlobalOptionFilters(SWModule * module, ConfigEntMap & section); public: bool shape; diff --git a/utilities/diatheke/tcl/README b/utilities/diatheke/tcl/README index 4614422..e066efb 100644 --- a/utilities/diatheke/tcl/README +++ b/utilities/diatheke/tcl/README @@ -1,53 +1,53 @@ -Diatheke/Tcl by Chris Little -Based on code schema of - -####################################################################### -Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org) - CrossWire Bible Society - P. O. Box 2528 - Tempe, AZ 85280-2528 - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation version 2. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -####################################################################### - -This script is intended for use with libraries and modules from -The SWORD Project, available at http://www.crosswire.org/ - -This script requires the Diatheke command line front end to The SWORD -Project. You should really install this first, including all optional -components: zlib, CLucene, ICU (preferrably icu-sword), and cURL. Then -install any modules you want to make available to users. - -Modify the file biblebot-diatheke.tcl as necessary so that the two -variables "diatheke" and "dict" point to the copies of the diatheke -and dict programs on your system. - -Finally, run the Perl script makebooklist.pl, which will -create/overwrite the file biblebot-diatheke-books.tcl. This includes -all books installed on the system, so remove any entries you want to -hide from users, as necessary. - -To install Diatheke/Tcl, install an eggdrop IRC bot, copy the -Diatheke/Tcl .tcl files (biblebot-diatheke.tcl and -biblebot-diatheke-books.tcl) to your eggdrop scripts directory, and -add a line to the end of your bot startup script to load the two -Diatheke/Tcl scripts, for example: - -source /usr/share/eggdrop/scripts/biblebot-diatheke.tcl -source /usr/share/eggdrop/scripts/biblebot-diatheke-books.tcl - -This script has been tested with eggdrop 1.3.23 & 1.6.19, but should -function fine in later versions. - -When you get the script loaded, type !biblehelp in a channel where -the bot is present and it will give you a full list of commands. -More commands will appear to you depending upon which mode the bot is -in and whether you are an op on the bot or voiced in the channel. +Diatheke/Tcl by Chris Little +Based on code schema of + +####################################################################### +Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org) + CrossWire Bible Society + P. O. Box 2528 + Tempe, AZ 85280-2528 + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation version 2. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +####################################################################### + +This script is intended for use with libraries and modules from +The SWORD Project, available at http://www.crosswire.org/ + +This script requires the Diatheke command line front end to The SWORD +Project. You should really install this first, including all optional +components: zlib, CLucene, ICU (preferrably icu-sword), and cURL. Then +install any modules you want to make available to users. + +Modify the file biblebot-diatheke.tcl as necessary so that the two +variables "diatheke" and "dict" point to the copies of the diatheke +and dict programs on your system. + +Finally, run the Perl script makebooklist.pl, which will +create/overwrite the file biblebot-diatheke-books.tcl. This includes +all books installed on the system, so remove any entries you want to +hide from users, as necessary. + +To install Diatheke/Tcl, install an eggdrop IRC bot, copy the +Diatheke/Tcl .tcl files (biblebot-diatheke.tcl and +biblebot-diatheke-books.tcl) to your eggdrop scripts directory, and +add a line to the end of your bot startup script to load the two +Diatheke/Tcl scripts, for example: + +source /usr/share/eggdrop/scripts/biblebot-diatheke.tcl +source /usr/share/eggdrop/scripts/biblebot-diatheke-books.tcl + +This script has been tested with eggdrop 1.3.23 & 1.6.19, but should +function fine in later versions. + +When you get the script loaded, type !biblehelp in a channel where +the bot is present and it will give you a full list of commands. +More commands will appear to you depending upon which mode the bot is +in and whether you are an op on the bot or voiced in the channel. diff --git a/utilities/diatheke/thmlcgi.cpp b/utilities/diatheke/thmlcgi.cpp index 9b85c35..e75ba50 100644 --- a/utilities/diatheke/thmlcgi.cpp +++ b/utilities/diatheke/thmlcgi.cpp @@ -2,7 +2,7 @@ * * thmlcgi.cpp - ThMLCGI: ThML to Diatheke/CGI format filter * - * $Id: thmlcgi.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlcgi.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -198,9 +198,10 @@ bool ThMLCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *ba else { buf += '<'; - for (i = 0; i < strlen(token); i++) + for (i = 0; i < strlen(token); i++) { buf += token[i]; - buf += '>'; + } + buf += '>'; //return false; // we still didn't handle token } } diff --git a/utilities/emptyvss.cpp b/utilities/emptyvss.cpp index e4252f9..011484d 100644 --- a/utilities/emptyvss.cpp +++ b/utilities/emptyvss.cpp @@ -2,7 +2,7 @@ * * emptyvss.cpp - Utility to list empty verses in a module * - * $Id: emptyvss.cpp 2931 2013-07-31 13:07:26Z scribe $ + * $Id: emptyvss.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -73,9 +73,11 @@ int main(int argc, char **argv) { while (!mod->popError()) { - if (vkey->getVerse()) - if (!mod->renderText().length()) - std::cout << *vkey << std::endl; - (*mod)++; + if (vkey->getVerse()) { + if (!mod->renderText().length()) { + std::cout << *vkey << std::endl; + } + (*mod)++; + } } } diff --git a/utilities/gbfidx.cpp b/utilities/gbfidx.cpp index 8b1d1dd..a86f24e 100644 --- a/utilities/gbfidx.cpp +++ b/utilities/gbfidx.cpp @@ -3,7 +3,7 @@ * gbfidx.cpp - This code reeks but works (at least for WEB). * Good luck! * - * $Id: gbfidx.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: gbfidx.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/genbookutil.cpp b/utilities/genbookutil.cpp index 71363e3..24fa4e0 100644 --- a/utilities/genbookutil.cpp +++ b/utilities/genbookutil.cpp @@ -2,7 +2,7 @@ * * genbookutil.cpp - * - * $Id: genbookutil.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: genbookutil.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/imp2gbs.cpp b/utilities/imp2gbs.cpp index dde871f..3c422a4 100644 --- a/utilities/imp2gbs.cpp +++ b/utilities/imp2gbs.cpp @@ -2,7 +2,7 @@ * * imp2gbs.cpp - Utility to import GenBooks in IMP format * - * $Id: imp2gbs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: imp2gbs.cpp 3403 2016-02-09 16:53:41Z dmsmith $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -126,7 +126,7 @@ void parseParams(int argc, char **argv) { outPath.size(i); } } - + void writeEntry(SWModule *book, SWBuf keyBuffer, SWBuf entBuffer) { @@ -222,22 +222,22 @@ void writeEntry(SWModule *book, SWBuf keyBuffer, SWBuf entBuffer) { int main(int argc, char **argv) { greekAccentsFilter.setOptionValue("Off"); // off = accents off parseParams(argc, argv); - + // Let's see if we can open our input file FileDesc *fd = FileMgr::getSystemFileMgr()->open(inFile, FileMgr::RDONLY); if (fd->getFd() < 0) { fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], inFile.c_str()); exit(-2); } - + RawGenBook *book; - + // Do some initialization stuff if (!augMod) { RawGenBook::createModule(outPath); } book = new RawGenBook(outPath); - + SWBuf lineBuffer; SWBuf keyBuffer; SWBuf entBuffer; diff --git a/utilities/imp2ld.cpp b/utilities/imp2ld.cpp index 7d8b604..67e74ae 100644 --- a/utilities/imp2ld.cpp +++ b/utilities/imp2ld.cpp @@ -2,9 +2,9 @@ * * imp2ld.cpp - Utility to import LD modules in IMP format * - * $Id: imp2ld.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: imp2ld.cpp 3223 2014-05-01 05:56:07Z scribe $ * - * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,8 +31,16 @@ #include #include #include -#include #include +#ifndef EXCLUDEZLIB +#include +#endif +#ifndef EXCLUDEBZIP2 +#include +#endif +#ifndef EXCLUDEXZ +#include +#endif #include using std::string; @@ -43,15 +51,16 @@ using namespace sword; void usage(const char *progName, const char *error = 0) { if (error) fprintf(stderr, "\n%s: %s\n", progName, error); - fprintf(stderr, "\n=== imp2ld (Revision $Rev: 2234 $) SWORD lexicon importer.\n"); + fprintf(stderr, "\n=== imp2ld (Revision $Rev: 3223 $) SWORD lexicon importer.\n"); fprintf(stderr, "\nusage: %s [options]\n", progName); fprintf(stderr, " -a\t\t\t augment module if exists (default is to create new)\n"); - fprintf(stderr, " -z\t\t\t use ZIP compression (default no compression)\n"); - fprintf(stderr, " -Z\t\t\t use LZSS compression (default no compression)\n"); - fprintf(stderr, " -o \t where to write data files.\n"); - fprintf(stderr, " -4\t\t\t use 4 byte size entries (default is 2).\n"); + fprintf(stderr, " -z \t\t use compression (default: none)\n"); + fprintf(stderr, "\t\t\t\t l - LZSS; z - ZIP; b - bzip2; x - xz\n"); + fprintf(stderr, " -o \t\t where to write data files.\n"); + fprintf(stderr, " -4\t\t\t use 4 byte size entries (default: 2).\n"); fprintf(stderr, " -b \t\t compression block size (default 30 entries)\n"); fprintf(stderr, " -s\t\t\t case sensitive keys (default is not case sensitive)\n"); + fprintf(stderr, " -P\t\t\t disable key Strong's number padding (by default keys will be padded)."); fprintf(stderr, "\n"); fprintf(stderr, "'imp' format is a simple standard for importing data into SWORD modules.\n" "Required is a plain text file containing $$$key lines followed by content.\n\n" @@ -79,6 +88,7 @@ int main(int argc, char **argv) { SWCompress *compressor = 0; SWBuf compType = ""; bool fourByteSize = false; + bool strongsPadding = true; if (argc < 2) usage(*argv); @@ -90,9 +100,16 @@ int main(int argc, char **argv) { append = true; } else if (!strcmp(argv[i], "-z")) { - if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); if (fourByteSize) usage(*argv, "Cannot specify both -z and -4"); compType = "ZIP"; + if (i+1 < argc && argv[i+1][0] != '-') { + switch (argv[++i][0]) { + case 'l': compType = "LZSS"; break; + case 'z': compType = "ZIP"; break; + case 'b': compType = "BZIP2"; break; + case 'x': compType = "XZ"; break; + } + } } else if (!strcmp(argv[i], "-Z")) { if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); @@ -102,6 +119,9 @@ int main(int argc, char **argv) { else if (!strcmp(argv[i], "-4")) { fourByteSize = true; } + else if (!strcmp(argv[i], "-P")) { + strongsPadding = false; + } else if (!strcmp(argv[i], "-b")) { if (i+1 < argc) { blockCount = atoi(argv[++i]); @@ -128,21 +148,39 @@ int main(int argc, char **argv) { } std::ifstream infile(inFileName); - + if (!infile.is_open()) { + fprintf(stderr, "\nERROR: %s: could not open file for reading: %s\n\n", *argv, inFileName); + exit(-2); + } SWModule *mod = 0; SWKey *key, *linkKey; - if (compType == "ZIP") { + if (compType == "LZSS") { + compressor = new LZSSCompress(); + } + else if (compType == "ZIP") { #ifndef EXCLUDEZLIB compressor = new ZipCompress(); #else - usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library"); + usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libz is available when compiling SWORD library"); #endif } - else if (compType == "LZSS") { - compressor = new LZSSCompress(); + else if (compType == "BZIP2") { +#ifndef EXCLUDEBZIP2 + compressor = new Bzip2Compress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with bzip2 compression support.\n\tBe sure libbz2 is available when compiling SWORD library"); +#endif } + else if (compType == "XZ") { +#ifndef EXCLUDEXZ + compressor = new XzCompress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with xz compression support.\n\tBe sure liblzma is available when compiling SWORD library"); +#endif + } + // setup module if (!append) { @@ -162,12 +200,12 @@ int main(int argc, char **argv) { if (compressor) { // Create a compressed text module allowing very large entries // Taking defaults except for first, fourth, fifth and last argument - mod = new zLD(outPath, 0, 0, blockCount, compressor, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive); + mod = new zLD(outPath, 0, 0, blockCount, compressor, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive, strongsPadding); } else { mod = (!fourByteSize) - ? (SWModule *)new RawLD (outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive) - : (SWModule *)new RawLD4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive); + ? (SWModule *)new RawLD (outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive, strongsPadding) + : (SWModule *)new RawLD4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive, strongsPadding); } @@ -224,8 +262,8 @@ int main(int argc, char **argv) { infile.close(); delete linkKey; - delete key; delete mod; + delete key; return 0; } diff --git a/utilities/imp2vs.cpp b/utilities/imp2vs.cpp index cc26f0b..3e51cd4 100644 --- a/utilities/imp2vs.cpp +++ b/utilities/imp2vs.cpp @@ -2,9 +2,9 @@ * * imp2vs.cpp - Utility to import IMP formatted VerseKey modules * - * $Id: imp2vs.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: imp2vs.cpp 3515 2017-11-01 11:38:09Z scribe $ * - * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -34,8 +34,17 @@ #include #include #include +#ifndef EXCLUDEZLIB #include +#endif +#ifndef EXCLUDEBZIP2 +#include +#endif +#ifndef EXCLUDEXZ +#include +#endif #include +#include #ifndef NO_SWORD_NAMESPACE using namespace sword; @@ -43,15 +52,15 @@ using namespace sword; using namespace std; -void writeEntry(const SWBuf &key, const SWBuf &entry, SWModule *module); +void writeEntry(SWModule *module, const SWBuf &key, const SWBuf &entry); void usage(const char *progName, const char *error = 0) { if (error) fprintf(stderr, "\n%s: %s\n", progName, error); - fprintf(stderr, "\n=== imp2vs (Revision $Rev: 2234 $) SWORD Bible/Commentary importer.\n"); + fprintf(stderr, "\n=== imp2vs (Revision $Rev: 3515 $) SWORD Bible/Commentary importer.\n"); fprintf(stderr, "\nusage: %s [options]\n", progName); fprintf(stderr, " -a\t\t\t augment module if exists (default is to create new)\n"); - fprintf(stderr, " -z\t\t\t use ZIP compression (default no compression)\n"); - fprintf(stderr, " -Z\t\t\t use LZSS compression (default no compression)\n"); + fprintf(stderr, " -z \t\t use compression (default: none):\n"); + fprintf(stderr, "\t\t\t\t l - LZSS; z - ZIP; b - bzip2; x - xz\n"); fprintf(stderr, " -o \t where to write data files.\n"); fprintf(stderr, " -4\t\t\t use 4 byte size entries (default is 2).\n"); fprintf(stderr, " -b <2|3|4>\t\t compression block size (default 4):\n"); @@ -62,8 +71,10 @@ void usage(const char *progName, const char *error = 0) { StringList av11n = vmgr->getVersificationSystems(); for (StringList::iterator loop = av11n.begin(); loop != av11n.end(); loop++) { fprintf(stderr, "\t\t\t\t\t%s\n", (*loop).c_str()); - } + } fprintf(stderr, " -l \t\t specify a locale scheme to use (default is en)\n"); + fprintf(stderr, " -c \t encipher module using supplied key\n"); + fprintf(stderr, "\t\t\t\t (default no enciphering)\n"); fprintf(stderr, "\n"); fprintf(stderr, "'imp' format is a simple standard for importing data into SWORD modules.\n" "Required is a plain text file containing $$$key lines followed by content.\n\n" @@ -89,24 +100,32 @@ int main(int argc, char **argv) { const char *progName = argv[0]; const char *inFileName = argv[1]; - SWBuf v11n = "KJV"; - SWBuf outPath = "./"; + SWBuf v11n = "KJV"; + SWBuf outPath = "./"; SWBuf locale = "en"; bool fourByteSize = false; - bool append = false; - int iType = 4; + bool append = false; + int iType = 4; + SWBuf cipherKey = ""; SWCompress *compressor = 0; - SWBuf compType = ""; + SWBuf compType = ""; for (int i = 2; i < argc; i++) { if (!strcmp(argv[i], "-a")) { append = true; } else if (!strcmp(argv[i], "-z")) { - if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); if (fourByteSize) usage(*argv, "Cannot specify both -z and -4"); compType = "ZIP"; + if (i+1 < argc && argv[i+1][0] != '-') { + switch (argv[++i][0]) { + case 'l': compType = "LZSS"; break; + case 'z': compType = "ZIP"; break; + case 'b': compType = "BZIP2"; break; + case 'x': compType = "XZ"; break; + } + } } else if (!strcmp(argv[i], "-Z")) { if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); @@ -135,23 +154,42 @@ int main(int argc, char **argv) { if (i+1 < argc) locale = argv[++i]; else usage(progName, "-l requires "); } + else if (!strcmp(argv[i], "-c")) { + if (i+1 < argc) cipherKey = argv[++i]; + else usage(*argv, "-c requires "); + } else usage(progName, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str()); } // ----------------------------------------------------- const VersificationMgr::System *v = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(v11n); if (!v) std::cout << "Warning: Versification " << v11n << " not found. Using KJV versification...\n"; - if (compType == "ZIP") { + if (compType == "LZSS") { + compressor = new LZSSCompress(); + } + else if (compType == "ZIP") { #ifndef EXCLUDEZLIB compressor = new ZipCompress(); #else - usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library"); + usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libz is available when compiling SWORD library"); #endif } - else if (compType == "LZSS") { - compressor = new LZSSCompress(); + else if (compType == "BZIP2") { +#ifndef EXCLUDEBZIP2 + compressor = new Bzip2Compress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with bzip2 compression support.\n\tBe sure libbz2 is available when compiling SWORD library"); +#endif + } + else if (compType == "XZ") { +#ifndef EXCLUDEXZ + compressor = new XzCompress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with xz compression support.\n\tBe sure liblzma is available when compiling SWORD library"); +#endif } + // setup module if (!append) { if (compressor) { @@ -190,6 +228,14 @@ int main(int argc, char **argv) { ? (SWModule *)new RawText(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n) : (SWModule *)new RawText4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n); } + + SWFilter *cipherFilter = 0; + + if (cipherKey.length()) { + fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() ); + cipherFilter = new CipherFilter(cipherKey.c_str()); + module->addRawFilter(cipherFilter); + } // ----------------------------------------------------- // setup locale manager @@ -211,28 +257,39 @@ int main(int argc, char **argv) { FileDesc *fd = FileMgr::getSystemFileMgr()->open(inFileName, FileMgr::RDONLY); SWBuf lineBuffer; - SWBuf currentKey; - SWBuf currentEntry; + SWBuf keyBuffer; + SWBuf entBuffer; - while (FileMgr::getLine(fd, lineBuffer)) { + bool more = true; + do { + more = FileMgr::getLine(fd, lineBuffer)!=0; if (lineBuffer.startsWith("$$$")) { - writeEntry(currentKey, currentEntry, module); - currentKey = lineBuffer; - currentKey << 3; - currentKey.trim(); - currentEntry = ""; + if ((keyBuffer.size()) && (entBuffer.size())) { + writeEntry(module, keyBuffer, entBuffer); + } + keyBuffer = lineBuffer; + keyBuffer << 3; + keyBuffer.trim(); + entBuffer.size(0); } else { - currentEntry += lineBuffer; + if (keyBuffer.size()) { + entBuffer += lineBuffer; + entBuffer += "\n"; + } } + } while (more); + if ((keyBuffer.size()) && (entBuffer.size())) { + writeEntry(module, keyBuffer, entBuffer); } - writeEntry(currentKey, currentEntry, module); - - FileMgr::getSystemFileMgr()->close(fd); delete module; + if (cipherFilter) + delete cipherFilter; delete vkey; + FileMgr::getSystemFileMgr()->close(fd); + return 0; } @@ -241,7 +298,7 @@ int main(int argc, char **argv) { int page = 0; -void writeEntry(const SWBuf &key, const SWBuf &entry, SWModule *module) +void writeEntry(SWModule *module, const SWBuf &key, const SWBuf &entry) { if (key.size() && entry.size()) { std::cout << "from file: " << key << std::endl; diff --git a/utilities/installmgr.cpp b/utilities/installmgr.cpp index b705c25..d27d886 100644 --- a/utilities/installmgr.cpp +++ b/utilities/installmgr.cpp @@ -2,7 +2,7 @@ * * installmgr.cpp - commandline InstallMgr utility * - * $Id: installmgr.cpp 2932 2013-07-31 14:07:01Z scribe $ + * $Id: installmgr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -47,6 +47,9 @@ StatusReporter *statusReporter = 0; SWBuf baseDir; SWBuf confPath; +bool isConfirmed; +bool isUnvPeerAllowed; + void usage(const char *progName = 0, const char *error = 0); class MyInstallMgr : public InstallMgr { @@ -55,6 +58,10 @@ public: virtual bool isUserDisclaimerConfirmed() const { static bool confirmed = false; + + if (isConfirmed) { + confirmed = true; + } if (!confirmed) { cout << "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"; cout << " -=+* WARNING *+=- -=+* WARNING *+=-\n\n\n"; @@ -84,6 +91,30 @@ virtual bool isUserDisclaimerConfirmed() const { }; +bool isUnverifiedPeerAllowed() { + static bool allowed = false; + + if (isUnvPeerAllowed) { + allowed = true; + } + if (!allowed) { + cout << "\n\n"; + cout << "While connecting to an encrypted install source, SWORD can allow\n"; + cout << "unverified peers, e.g., self-signed certificates. While this is\n"; + cout << "generally considered safe because SWORD only retrieves Bible content\n"; + cout << "and does not send any data to the server, it could still possibly\n"; + cout << "allow a malicious actor to sit between you and the server, as with\n"; + cout << "unencrypted sources. Type no to turn this off.\n\n"; + cout << "Would you like to allow unverified peers? [yes] "; + + char prompt[10]; + fgets(prompt, 9, stdin); + allowed = (strcmp(prompt, "no\n")); + cout << "\n"; + } + return allowed; +} + class MyStatusReporter : public StatusReporter { int last; virtual void update(unsigned long totalBytes, unsigned long completedBytes) { @@ -121,7 +152,7 @@ void init() { if (!mgr->config) usage(0, "ERROR: SWORD configuration not found. Please configure SWORD before using this program."); - SWBuf baseDir = mgr->getHomeDir(); + SWBuf baseDir = FileMgr::getSystemFileMgr()->getHomeDir(); if (baseDir.length() < 1) baseDir = "."; baseDir += "/.sword/InstallMgr"; confPath = baseDir + "/InstallMgr.conf"; @@ -147,7 +178,7 @@ void finish(int status) { } -void createBasicConfig(bool enableRemote, bool addCrossWire) { +void createBasicConfig(bool enableRemote, bool addCrossWire, bool unverifiedPeerAllowed) { FileMgr::createParent(confPath.c_str()); remove(confPath.c_str()); @@ -159,10 +190,11 @@ void createBasicConfig(bool enableRemote, bool addCrossWire) { SWConfig config(confPath.c_str()); config["General"]["PassiveFTP"] = "true"; + config["General"]["UnverifiedPeerAllowed"] = (unverifiedPeerAllowed) ? "true" : "false"; if (enableRemote) { config["Sources"]["FTPSource"] = is.getConfEnt(); } - config.Save(); + config.save(); } @@ -170,11 +202,13 @@ void initConfig() { init(); bool enable = installMgr->isUserDisclaimerConfirmed(); + bool allowed = isUnverifiedPeerAllowed(); - createBasicConfig(enable, true); + createBasicConfig(enable, true, allowed); cout << "\n\nInitialized basic config file at [" << confPath << "]\n"; cout << "with remote source features " << ((enable) ? "ENABLED" : "DISABLED") << "\n"; + cout << "with unverified peers " << ((allowed) ? "ALLOWED" : "DISALLOWED") << "\n"; } @@ -188,7 +222,7 @@ void syncConfig() { // be sure we have at least some config file already out there if (!FileMgr::existsFile(confPath.c_str())) { - createBasicConfig(true, false); + createBasicConfig(true, false, false); finish(1); // cleanup and don't exit init(); // re-init with InstallMgr which uses our new config } @@ -271,6 +305,26 @@ void remoteListModules(const char *sourceName, bool onlyNewAndUpdated = false) { } +void remoteDescribeModule(const char *sourceName, const char *modName) { + init(); + InstallSourceMap::iterator source = installMgr->sources.find(sourceName); + if (source == installMgr->sources.end()) { + fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName); + finish(-3); + } + SWMgr *mgr = source->second->getMgr(); + SWModule *m = mgr->getModule(modName); + if (!m) { + fprintf(stderr, "Couldn't find module [%s] in source [%s]\n", modName, sourceName); + finish(-3); + } + cout << "Module Description\n\n"; + for (ConfigEntMap::const_iterator it = m->getConfig().begin(); it != m->getConfig().end(); ++it) { + cout << "[" << it->first << "]:" << it->second << "\n"; + } +} + + void localDirListModules(const char *dir) { cout << "Available Modules:\n\n"; SWMgr mgr(dir); @@ -323,7 +377,15 @@ void usage(const char *progName, const char *error) { if (error) fprintf(stderr, "\n%s: %s\n", (progName ? progName : "installmgr"), error); - fprintf(stderr, "\nusage: %s [command ...]\n" + fprintf(stderr, "\nusage: %s [--allow...] [command ...]\n" + "\n\t --allow-internet-access-and-risk-tracing-and-jail-or-martyrdom \n" + "\n This aptly named option will allow the program to connect to the internet without asking for user confirmation\n" + " In many places this may well be a risky or even foolish undertaking.\n" + " Please take special care before you use this option in scripts, particularly in scripts you want to offer for public download.\n" + " What may appear to be safe for you, may well not be safe for someone else, who uses your scripts. \n" + "\n\t --allow-unverified-tls-peer \n" + "\n This option will allow the program to connect to unverified peers\n" + " (e.g., hosts using self-signed certificates) without asking for user confirmation.\n" "\n Commands (run in order they are passed):\n\n" "\t-init\t\t\t\tcreate a basic user config file.\n" "\t\t\t\t\t\tWARNING: overwrites existing.\n" @@ -333,6 +395,7 @@ void usage(const char *progName, const char *error) { "\t-r \t\trefresh remote source\n" "\t-rl \t\tlist available modules from remote source\n" "\t-rd \t\tlist new/updated modules from remote source\n" + "\t-rdesc \tdescribe module from remote source\n" "\t-ri \tinstall module from remote source\n" "\t-l\t\t\t\tlist installed modules\n" "\t-u \t\t\tuninstall module\n" @@ -345,13 +408,22 @@ void usage(const char *progName, const char *error) { int main(int argc, char **argv) { - + + isConfirmed = false; + isUnvPeerAllowed = false; + if (argc < 2) usage(*argv); for (int i = 1; i < argc; i++) { if (!strcmp(argv[i], "-d")) { SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG); } + else if (!strcmp(argv[i], "--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom")) { + isConfirmed = true; + } + else if (!strcmp(argv[i], "--allow-unverified-tls-peer")) { + isUnvPeerAllowed = true; + } else if (!strcmp(argv[i], "-init")) { initConfig(); } @@ -393,6 +465,14 @@ int main(int argc, char **argv) { if (i+1 < argc) remoteListModules(argv[++i], true); else usage(*argv, "-rd requires "); } + else if (!strcmp(argv[i], "-rdesc")) { // describe remove module + if (i+2 < argc) { + const char *source = argv[++i]; + const char *modName = argv[++i]; + remoteDescribeModule(source, modName); + } + else usage(*argv, "-rdesc requires "); + } else if (!strcmp(argv[i], "-ri")) { // install from remote directory if (i+2 < argc) { const char *source = argv[++i]; diff --git a/utilities/mkfastmod.cpp b/utilities/mkfastmod.cpp index 5c1782b..4ea3e65 100644 --- a/utilities/mkfastmod.cpp +++ b/utilities/mkfastmod.cpp @@ -2,7 +2,7 @@ * * mkfastmod.cpp - * - * $Id: mkfastmod.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: mkfastmod.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/mod2imp.cpp b/utilities/mod2imp.cpp index ce382c3..097abdf 100644 --- a/utilities/mod2imp.cpp +++ b/utilities/mod2imp.cpp @@ -2,7 +2,7 @@ * * mod2imp.cpp - Utility to export a module in IMP format * - * $Id: mod2imp.cpp 2921 2013-07-28 17:21:44Z scribe $ + * $Id: mod2imp.cpp 3088 2014-03-09 13:09:00Z refdoc $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -46,10 +46,10 @@ using namespace sword; void usage(const char *progName, const char *error = 0) { if (error) fprintf(stderr, "\n%s: %s\n", progName, error); - fprintf(stderr, "\n=== mod2imp (Revision $Rev: 2234 $) SWORD module exporter.\n"); + fprintf(stderr, "\n=== mod2imp (Revision $Rev: 3088 $) SWORD module exporter.\n"); fprintf(stderr, "\nusage: %s [options]\n" "\t -r [output_format] - render content instead of outputting raw native\n" - "\t\tdata. output_format can be: OSIS, HTMLHREF, RTF.\n" + "\t\tdata. output_format can be: OSIS, XHTML, LATEX, HTMLHREF, RTF.\n" "\t -s - strip markup instead of outputting raw native data.\n" "\t -f - when rendering (-r, above), option\n" "\t\tfilter values can be set with this option.\n\n" @@ -94,6 +94,9 @@ int main(int argc, char **argv) if (renderForm == "HTMLHREF") markupMgr = new MarkupFilterMgr(sword::FMT_HTMLHREF); else if (renderForm == "OSIS") markupMgr = new MarkupFilterMgr(sword::FMT_OSIS); else if (renderForm == "RTF") markupMgr = new MarkupFilterMgr(sword::FMT_RTF); + else if (renderForm == "LATEX") markupMgr = new MarkupFilterMgr(sword::FMT_LATEX); + else if (renderForm == "XHTML") markupMgr = new MarkupFilterMgr(sword::FMT_XHTML); + else if (renderForm.length()) usage(progName, (((SWBuf) "Unknown output_format for -r (")+renderForm+")").c_str()); SWMgr *mgr = (markupMgr) ? new SWMgr(markupMgr) : new SWMgr(); diff --git a/utilities/mod2osis.cpp b/utilities/mod2osis.cpp index 40305c2..dc570f4 100644 --- a/utilities/mod2osis.cpp +++ b/utilities/mod2osis.cpp @@ -2,7 +2,7 @@ * * mod2osis.cpp - Exports a module as an OSIS doc * - * $Id: mod2osis.cpp 2972 2013-08-26 22:17:02Z scribe $ + * $Id: mod2osis.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -72,7 +72,7 @@ int main(int argc, char **argv) cerr << "In fact, you should never export SWORD modules.\n"; cerr << "Many CrossWire modules are licensed for use from publishers\n"; cerr << "and you will need to obtain your own permissions.\n"; - cerr << "We also do not encourage propogating encoding errors\n"; + cerr << "We also do not encourage propagating encoding errors\n"; cerr << "which you will avoid by obtaining text data from the source.\n\n"; cerr << "Please see the TextSource entry in the module's .conf file\n"; cerr << "for information where to obtain module data from our source.\n\n"; diff --git a/utilities/mod2vpl.cpp b/utilities/mod2vpl.cpp index 0b5ab1b..ddd8fd7 100644 --- a/utilities/mod2vpl.cpp +++ b/utilities/mod2vpl.cpp @@ -2,7 +2,7 @@ * * mod2vpl.cpp - Utility to export a module in VPL format * - * $Id: mod2vpl.cpp 2931 2013-07-31 13:07:26Z scribe $ + * $Id: mod2vpl.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/mod2zmod.cpp b/utilities/mod2zmod.cpp index 03fd8c5..512749f 100644 --- a/utilities/mod2zmod.cpp +++ b/utilities/mod2zmod.cpp @@ -2,9 +2,9 @@ * * mod2zmod.cpp - Compression on variable granularity * - * $Id: mod2zmod.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: mod2zmod.cpp 3130 2014-03-15 05:43:52Z chrislit $ * - * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2000-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -42,7 +42,16 @@ #include #include #include +#ifndef EXCLUDEZLIB #include +#endif +#ifndef EXCLUDEBZIP2 +#include +#endif +#ifndef EXCLUDEXZ +#include +#endif + #include #include #include @@ -58,10 +67,11 @@ using std::cout; void errorOutHelp(char *appName) { cerr << appName << " - a tool to create compressed Sword modules\n"; cerr << "version 0.1\n\n"; - cerr << "usage: "<< appName << " [blockType [compressType [cipherKey]]]\n\n"; + cerr << "usage: "<< appName << " [blockType [compressType [compressLevel [cipherKey]]]]\n\n"; cerr << "datapath: the directory in which to write the zModule\n"; cerr << "blockType : (default 4)\n\t2 - verses\n\t3 - chapters\n\t4 - books\n"; - cerr << "compressType: (default 1):\n\t1 - LZSS\n\t2 - Zip\n"; + cerr << "compressType: (default 1):\n\t1 - LZSS\n\t2 - Zip\n\t3 - bzip2\n\t4 - xz\n"; + cerr << "compressLevel: (default varies by compressType):\n\tA digit from 1-9. Greater values compress more, but require more\n\ttime/memory. Use 0 for the default compression level.\n"; cerr << "\n\n"; exit(-1); } @@ -75,9 +85,9 @@ int main(int argc, char **argv) SWCompress *compressor = 0; SWModule *inModule = 0; SWModule *outModule = 0; - + int compLevel = 0; - if ((argc < 3) || (argc > 6)) { + if ((argc < 3) || (argc > 7)) { errorOutHelp(argv[0]); } @@ -86,12 +96,15 @@ int main(int argc, char **argv) if (argc > 4) { compType = atoi(argv[4]); if (argc > 5) { - cipherKey = argv[5]; + compLevel = atoi(argv[5]); + if (argc > 6) { + cipherKey = argv[6]; + } } } } - if ((iType < 2) || (compType < 1) || (compType > 2) || (!strcmp(argv[1], "-h")) || (!strcmp(argv[1], "--help")) || (!strcmp(argv[1], "/?")) || (!strcmp(argv[1], "-?")) || (!strcmp(argv[1], "-help"))) { + if ((iType < 2) || (compType < 1) || (compType > 4) || compLevel < 0 || compLevel > 9 || (!strcmp(argv[1], "-h")) || (!strcmp(argv[1], "--help")) || (!strcmp(argv[1], "/?")) || (!strcmp(argv[1], "-?")) || (!strcmp(argv[1], "-help"))) { errorOutHelp(argv[0]); } @@ -119,7 +132,18 @@ int main(int argc, char **argv) switch (compType) { // these are deleted by zText case 1: compressor = new LZSSCompress(); break; + #ifndef EXCLUDEZLIB case 2: compressor = new ZipCompress(); break; + #endif + #ifndef EXCLUDEBZIP2 + case 3: compressor = new Bzip2Compress(); break; + #endif + #ifndef EXCLUDEXZ + case 4: compressor = new XzCompress(); break; + #endif + } + if (compressor && compLevel > 0) { + compressor->setLevel(compLevel); } int result = 0; diff --git a/utilities/modwrite.cpp b/utilities/modwrite.cpp index b55f034..0f67da1 100644 --- a/utilities/modwrite.cpp +++ b/utilities/modwrite.cpp @@ -2,7 +2,7 @@ * * modwrite.cpp - * - * $Id: modwrite.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: modwrite.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/osis2mod.cpp b/utilities/osis2mod.cpp index 3e3b692..7ffe4ff 100644 --- a/utilities/osis2mod.cpp +++ b/utilities/osis2mod.cpp @@ -1,13 +1,13 @@ /****************************************************************************** * - * osis2mod.cpp - Utility to import a module in OSIS format + * osis2mod.cpp - Utility to import a module in OSIS format * - * $Id: osis2mod.cpp 3314 2014-12-24 06:10:01Z greg.hellings $ + * $Id: osis2mod.cpp 3431 2016-08-16 22:46:19Z refdoc $ * * Copyright 2003-2014 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -44,14 +44,27 @@ #include #include +#include #include +#ifndef EXCLUDEZLIB #include +#endif +#ifndef EXCLUDEBZIP2 +#include +#endif +#ifndef EXCLUDEXZ +#include +#endif #include #ifdef _ICU_ #include #include +#include +#include #endif +#include +#include #ifndef NO_SWORD_NAMESPACE using namespace sword; @@ -82,6 +95,9 @@ const int EXIT_BAD_NESTING = 5; // BSP or BCV nesting is bad UTF8NFC normalizer; Latin1UTF8 converter; #endif +SWFilter* outputEncoder = NULL; +SWFilter* outputDecoder = NULL; + int normalized = 0; int converted = 0; @@ -113,7 +129,8 @@ bool isOSISAbbrev(const char *buf) { * U-00000000 - U-0000007F 0nnnnnnn * U-00000080 - U-000007FF 110nnnnn 10nnnnnn * U-00000800 - U-0000FFFF 1110nnnn 10nnnnnn 10nnnnnn - * U-00010000 - U-001FFFFF 11110nnn 10nnnnnn 10nnnnnn 10nnnnnn + * U-00010000 - U-0010FFFF 11110nnn 10nnnnnn 10nnnnnn 10nnnnnn + * * Note: * 1. The latest UTF-8 RFC allows for a max of 4 bytes. * Earlier allowed 6. @@ -465,7 +482,7 @@ void makeValidRef(VerseKey &key) { void writeEntry(SWBuf &text, bool force = false) { char keyOsisID[255]; - static const char* revision = ""; + static const char* revision = ""; static bool firstOT = true; static bool firstNT = true; @@ -525,6 +542,11 @@ void writeEntry(SWBuf &text, bool force = false) { } } + // If the desired output encoding is non-UTF-8, convert to that encoding + if (outputEncoder) { + outputEncoder->processText(activeVerseText, (SWKey *)2); // note the hack of 2 to mimic a real key. TODO: remove all hacks + } + // If the entry already exists, then append this entry to the text. // This is for verses that are outside the chosen versification. They are appended to the prior verse. // The space should not be needed if we retained verse tags. @@ -532,7 +554,16 @@ void writeEntry(SWBuf &text, bool force = false) { module->flush(); SWBuf currentText = module->getRawEntry(); cout << "INFO(WRITE): Appending entry: " << currentVerse.getOSISRef() << ": " << activeVerseText << endl; + + // If we have a non-UTF-8 encoding, we should decode it before concatenating, then re-encode it + if (outputDecoder) { + outputDecoder->processText(activeVerseText, (SWKey *)2); + outputDecoder->processText(currentText, (SWKey *)2); + } activeVerseText = currentText + " " + activeVerseText; + if (outputEncoder) { + outputEncoder->processText(activeVerseText, (SWKey *)2); + } } if (debug & DEBUG_WRITE) { @@ -581,7 +612,7 @@ void linkToEntry(VerseKey &linkKey, VerseKey &dest) { } // Return true if the content was handled or is to be ignored. -// false if the what has been seen is to be accumulated and considered later. +// false if the what has been seen is to be accumulated and considered later. bool handleToken(SWBuf &text, XMLTag token) { // Everything between the begin book tag and the first begin chapter tag is inBookIntro @@ -671,7 +702,7 @@ bool handleToken(SWBuf &text, XMLTag token) { // BOOK START,
if (tokenName == "div" && typeAttr == "book") { - if (inBookIntro || inChapterIntro) { // this one should never happen, but just in case + if (inBookIntro || inChapterIntro) { // this one should never happen, but just in case if (debug & DEBUG_TITLE) { cout << "DEBUG(TITLE): " << currentOsisID << ": OOPS INTRO " << endl; @@ -855,7 +886,8 @@ bool handleToken(SWBuf &text, XMLTag token) { // Now consider everything else. - // "majorSection" is code for the Book 1-5 of Psalms +/* + // "majorSection" is code for the Book 1-5 of Psalms // This is incorrect assumption - majorSection can appear in any large book and can start and end inside chapters if (tokenName == "div" && typeAttr == "majorSection") { if (inBookIntro) { if (debug & DEBUG_TITLE) { @@ -870,6 +902,8 @@ bool handleToken(SWBuf &text, XMLTag token) { strcpy(currentOsisID, currentVerse.getOSISRef()); +// as a result of the incorrect assumption these flags are set also incorrectly and cause problems in situations where majorSections do not follow the assumptions made during creation of this patch + inChapter = false; inVerse = false; inPreVerse = false; @@ -884,7 +918,7 @@ bool handleToken(SWBuf &text, XMLTag token) { return false; } - +*/ // Handle WOC quotes. // Note this requires transformBSP to make them into milestones // Otherwise have to do it here @@ -930,8 +964,8 @@ bool handleToken(SWBuf &text, XMLTag token) { if (inChapterIntro) { // Determine when we are no longer in a chapter heading, but in pre-verse material: // If we see one of the following: - // a section div - // a title that is not main, chapter or sub or unclassified (no type attribute) + // a section div + // a title that is not main, chapter or sub or unclassified (no type attribute) if ((tokenName == "div" && typeAttr == "section") || (tokenName == "title" && typeAttr.length() != 0 && typeAttr != "main" && typeAttr != "chapter" && typeAttr != "sub") ) { @@ -994,7 +1028,7 @@ bool handleToken(SWBuf &text, XMLTag token) { if (tokenName != topToken.getName()) { cout << "FATAL(NESTING): " << currentOsisID << ": Expected " << topToken.getName() << " found " << tokenName << endl; -// exit(EXIT_BAD_NESTING); // (OSK) I'm sure this validity check is a good idea, but there's a but somewhere that's killing the converter here. +// exit(EXIT_BAD_NESTING); // (OSK) I'm sure this validity check is a good idea, but there's a bug somewhere that's killing the converter here. // So I'm disabling this line. Unvalidated OSIS files shouldn't be run through the converter anyway. // (DM) This has nothing to do with well-form or valid. It checks milestoned elements for proper nesting. } @@ -1182,6 +1216,7 @@ XMLTag transformBSP(XMLTag t) { static std::stack bspTagStack; static int sID = 1; char buf[11]; + SWBuf typeAttr = t.getAttribute("type"); // Support simplification transformations if (t.isEmpty()) { @@ -1206,12 +1241,13 @@ XMLTag transformBSP(XMLTag t) { // The following containers are milestoneable. // abbr, closer, div, foreign, l, lg, salute, signed, speech // Leaving out: - // abbr When would this ever cross a boundary? - // seg as it is used for a divineName hack - // foreign so that it can be easily italicized + // abbr When would this ever cross a boundary? + // seg as it is used for a divineName hack + // foreign so that it can be easily italicized + // div type="colophon" so that it can be treated as a block else if (tagName == "chapter" || tagName == "closer" || - tagName == "div" || + (tagName == "div" && typeAttr != "colophon") || tagName == "l" || tagName == "lg" || tagName == "q" || @@ -1241,11 +1277,13 @@ XMLTag transformBSP(XMLTag t) { } bspTagStack.pop(); + SWBuf topTypeAttr = topToken.getAttribute("type"); // Look for the milestoneable container tags handled above. + // Have to treat div type="colophon" differently if (tagName == "chapter" || tagName == "closer" || - tagName == "div" || + (tagName == "div" && topTypeAttr != "colophon") || tagName == "l" || tagName == "lg" || tagName == "p" || @@ -1321,15 +1359,18 @@ void usage(const char *app, const char *error = 0, const bool verboseHelp = fals fprintf(stderr, " \t\t path to the validated OSIS document, or '-' to\n"); fprintf(stderr, "\t\t\t\t read from standard input\n"); fprintf(stderr, " -a\t\t\t augment module if exists (default is to create new)\n"); - fprintf(stderr, " -z\t\t\t use ZIP compression (default no compression)\n"); - fprintf(stderr, " -Z\t\t\t use LZSS compression (default no compression)\n"); - fprintf(stderr, " -b <2|3|4>\t\t compression block size (default 4):\n"); + fprintf(stderr, " -z \t\t compression type (default: none)\n"); + fprintf(stderr, "\t\t\t\t l - LZSS; z - ZIP; b - bzip2; x - xz\n"); + fprintf(stderr, " -b <2|3|4>\t\t compression block size (default: 4)\n"); fprintf(stderr, "\t\t\t\t 2 - verse; 3 - chapter; 4 - book\n"); + fprintf(stderr, " -l <1-9>\t\t compression level (default varies by compression type)\n"); fprintf(stderr, " -c \t encipher module using supplied key\n"); fprintf(stderr, "\t\t\t\t (default no enciphering)\n"); -#ifdef _ICU_ - fprintf(stderr, " -N\t\t\t do not convert UTF-8 or normalize UTF-8 to NFC\n"); +#ifdef _ICU_ + fprintf(stderr, " -e <1|2|s>\t\t convert Unicode encoding (default: 1)\n"); + fprintf(stderr, "\t\t\t\t 1 - UTF-8 ; 2 - UTF-16 ; s - SCSU\n"); + fprintf(stderr, " -N\t\t\t do not normalize to NFC\n"); if (verboseHelp) { fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed,\n"); fprintf(stderr, "\t\t\t\t and then normalize to NFC)\n"); @@ -1386,7 +1427,7 @@ void usage(const char *app, const char *error = 0, const bool verboseHelp = fals void processOSIS(istream& infile) { typedef enum { - CS_NOT_IN_COMMENT, // or seen starting "<" + CS_NOT_IN_COMMENT, // or seen starting "<" CS_SEEN_STARTING_EXCLAMATION, CS_SEEN_STARTING_HYPHEN, CS_IN_COMMENT, @@ -1395,13 +1436,21 @@ void processOSIS(istream& infile) { CS_SEEN_ENDING_GREATER_THAN } t_commentstate; + typedef enum { + ET_NUM, + ET_HEX, + ET_CHAR, + ET_NONE, + ET_ERR + } t_entitytype; + activeOsisID[0] = '\0'; strcpy(currentOsisID,"N/A"); currentVerse.setVersificationSystem(v11n); currentVerse.setAutoNormalize(false); - currentVerse.setIntros(true); // turn on mod/testmnt/book/chap headings + currentVerse.setIntros(true); // turn on mod/testmnt/book/chap headings currentVerse.setPersist(true); module->setKey(currentVerse); @@ -1415,6 +1464,13 @@ void processOSIS(istream& infile) { bool inWhitespace = false; bool seeingSpace = false; unsigned char curChar = '\0'; + SWBuf entityToken; + bool inentity = false; + t_entitytype entitytype = ET_NONE; + unsigned char attrQuoteChar = '\0'; + bool inattribute = false; + unsigned int linePos = 1; + unsigned int charPos = 0; while (infile.good()) { @@ -1431,16 +1487,221 @@ void processOSIS(istream& infile) { // Does a SWORD module actually require this? if (curChar == '\n') { curChar = ' '; + charPos = 0; + linePos++; + } + charPos++; + + // Look for entities: + // These are of the form &#dddd;, &xHHHH; or &llll; + // where dddd is a sequence of digits + // HHHH is a sequence of [A-Fa-f0-9] + // llll is amp, lt, gt, quot or apos + // but we will look for a sequence of [A-Za-z0-9] + // All but &, <, >, ", ' will produce a WARNING + // In the future: + // &#dddd; and &xHHHH; should be converted to UTF-8, + // with a WARNING if the text is not UTF-8 + // &llll; other than the xml standard 5 should produce a WARNING + + // For entity diagnostics track whether the text is an attribute value + if (inattribute && (curChar == '\'' || curChar == '"')) { + if (attrQuoteChar == curChar) { + inattribute = false; + attrQuoteChar = '\0'; + } + else { + attrQuoteChar = curChar; + } + } + if (intoken && curChar == '=') { + inattribute = true; + attrQuoteChar = '\0'; + } + + if (!inentity && curChar == '&') { + inentity = true; + entitytype = ET_NONE; + entityToken = "&"; + continue; + } + + if (inentity) { + if (curChar == ';') { + inentity = false; + } + else { + switch (entitytype) { + case ET_NONE: + // A hex entity cannot start with X in XML, but it can in HTML + // Allow for it here and complain later + if (curChar == 'x' || curChar == 'X') { + entitytype = ET_HEX; + } + else + if (curChar == '#') { + entitytype = ET_NUM; + } + else + if ((curChar >= 'A' && curChar <= 'Z') || + (curChar >= 'a' && curChar <= 'z') || + (curChar >= '0' && curChar <= '9')) { + entitytype = ET_CHAR; + } + else { + inentity = false; + entitytype = ET_ERR; + } + break; + + case ET_NUM : + if (!(curChar >= '0' && curChar <= '9')) { + inentity = false; + entitytype = ET_ERR; + } + break; + case ET_HEX : + if ((curChar >= 'G' && curChar <= 'Z') || + (curChar >= 'g' && curChar <= 'z')) { + // Starts out as a HEX entity, but it isn't one + entitytype = ET_CHAR; + } + else + if (!((curChar >= 'A' && curChar <= 'F') || + (curChar >= 'a' && curChar <= 'f') || + (curChar >= '0' && curChar <= '9'))) { + inentity = false; + entitytype = ET_ERR; + } + break; + case ET_CHAR : + if (!((curChar >= 'A' && curChar <= 'Z') || + (curChar >= 'a' && curChar <= 'z') || + (curChar >= '0' && curChar <= '9'))) { + inentity = false; + entitytype = ET_ERR; + } + break; + default: + cout << "FATAL(ENTITY): unknown entitytype on entity end: " << entitytype << endl; + exit(EXIT_BAD_NESTING); + } + } + + if (entitytype != ET_ERR) { + entityToken.append((char) curChar); + } + + // It is an entity, perhaps invalid, if curChar is ';', error otherwise + // Test to see if we now have an entity or a failure + // It may not be a valid entity. + if (!inentity) { + switch (entitytype) { + case ET_ERR : + // Remove the leading & + entityToken << 1; + cout << "WARNING(PARSE): malformed entity, replacing &" << entityToken << " with &" << entityToken << endl; + if (intoken) { + token.append("&"); + token.append(entityToken); + } + else { + text.append("&"); + text.append(entityToken); + } + break; + case ET_HEX : + if (entityToken[1] != 'x') { + cout << "WARNING(PARSE): HEX entity must begin with &x, found " << entityToken << endl; + } + else { + cout << "WARNING(PARSE): SWORD does not search HEX entities, found " << entityToken << endl; + } + break; + case ET_CHAR : + if (strcmp(entityToken, "&") && + strcmp(entityToken, "<") && + strcmp(entityToken, ">") && + strcmp(entityToken, """) && + strcmp(entityToken, "'")) { + cout << "WARNING(PARSE): XML only supports 5 Character entities &, <, >, " and ', found " << entityToken << endl; + } + else + if (!strcmp(entityToken, "'")) { + cout << "WARNING(PARSE): While valid for XML, XHTML does not support '." << endl; + if (!inattribute) { + cout << "WARNING(PARSE): ' is unnecessary outside of attribute values. Replacing with '. " << endl; + entityToken = "'"; + } + else { + switch (attrQuoteChar) { + case '"' : + cout << "WARNING(PARSE): ' is unnecessary inside double quoted attribute values. Replacing with '. " << endl; + entityToken = "'"; + break; + case '\'' : + cout << "WARNING(PARSE): ' is only needed within single quoted attribute values. Considering using double quoted attribute and replacing with '." << endl; + break; + } + } + } + else + if (!strcmp(entityToken, """)) { + cout << "WARNING(PARSE): While valid for XML, " is only needed within double quoted attribute values" << endl; + if (!inattribute) { + cout << "WARNING(PARSE): " is unnecessary outside of attribute values. Replace with \"." << endl; + entityToken = "\""; + } + else { + switch (attrQuoteChar) { + case '"' : + cout << "WARNING(PARSE): " is only needed within double quoted attribute values. Considering using single quoted attribute and replacing with \"." << endl; + break; + case '\'' : + cout << "WARNING(PARSE): " is unnecessary inside single quoted attribute values. Replace with \"." << endl; + entityToken = "\""; + break; + } + } + } + break; + case ET_NUM : + cout << "WARNING(PARSE): SWORD does not search numeric entities, found " << entityToken << endl; + break; + case ET_NONE : + default: + break; + } + + // Put the entity into the stream. + if (intoken) { + token.append(entityToken); + } + else { + text.append(entityToken); + } + + if (curChar == ';') { + // The character was handled, so go get the next one. + continue; + } + } + else { + // The character was handled, so go get the next one. + continue; + } } + if (!intoken && curChar == '<') { intoken = true; token = "<"; + inattribute = false; + attrQuoteChar = '\0'; continue; } // Handle XML comments starting with "" - if (intoken && !incomment) { switch (commentstate) { case CS_NOT_IN_COMMENT : @@ -1565,8 +1826,8 @@ void processOSIS(istream& infile) { } else { switch (curChar) { - case '>' : text.append(">"); break; - case '<' : text.append("<"); break; + case '>' : cout << "WARNING(PARSE): > should be >" << endl; text.append(">"); break; + case '<' : cout << "WARNING(PARSE): < should be <" << endl; text.append("<"); break; default : text.append((char) curChar); break; } } @@ -1585,7 +1846,7 @@ void processOSIS(istream& infile) { int main(int argc, char **argv) { - fprintf(stderr, "You are running osis2mod: $Rev: 3314 $\n"); + fprintf(stderr, "You are running osis2mod: $Rev: 3431 $\n"); if (argc > 1) { for (int i = 1; i < argc; i++) { @@ -1611,19 +1872,25 @@ int main(int argc, char **argv) { int entrySize = 0; SWBuf cipherKey = ""; SWCompress *compressor = 0; + int compLevel = 0; for (int i = 3; i < argc; i++) { if (!strcmp(argv[i], "-a")) { append = 1; } else if (!strcmp(argv[i], "-z")) { - if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); - if (entrySize) usage(*argv, "Cannot specify both -z and -s"); compType = "ZIP"; + if (i+1 < argc && argv[i+1][0] != '-') { + switch (argv[++i][0]) { + case 'l': compType = "LZSS"; break; + case 'z': compType = "ZIP"; break; + case 'b': compType = "BZIP2"; break; + case 'x': compType = "XZ"; break; + } + } } else if (!strcmp(argv[i], "-Z")) { if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); - if (entrySize) usage(*argv, "Cannot specify both -Z and -s"); compType = "LZSS"; } else if (!strcmp(argv[i], "-b")) { @@ -1636,6 +1903,30 @@ int main(int argc, char **argv) { else if (!strcmp(argv[i], "-N")) { normalize = false; } + else if (!strcmp(argv[i], "-e")) { + if (i+1 < argc) { + switch (argv[++i][0]) { + case '1': // leave as UTF-8 + outputEncoder = NULL; + outputDecoder = NULL; + break; + + case '2': + outputEncoder = new UTF8UTF16(); + outputDecoder = new UTF16UTF8(); + break; +#ifdef _ICU_ + case 's': + outputEncoder = new UTF8SCSU(); + outputDecoder = new SCSUUTF8(); + break; +#endif + default: + outputEncoder = NULL; + outputDecoder = NULL; + } + } + } else if (!strcmp(argv[i], "-c")) { if (i+1 < argc) cipherKey = argv[++i]; else usage(*argv, "-c requires "); @@ -1645,7 +1936,6 @@ int main(int argc, char **argv) { else usage(*argv, "-v requires "); } else if (!strcmp(argv[i], "-s")) { - if (compType.size()) usage(*argv, "Cannot specify -s and -z or -Z"); if (i+1 < argc) { entrySize = atoi(argv[++i]); if (entrySize == 2 || entrySize == 4) { @@ -1661,20 +1951,48 @@ int main(int argc, char **argv) { if (i+1 < argc) debug |= atoi(argv[++i]); else usage(*argv, "-d requires "); } + else if (!strcmp(argv[i], "-l")) { + if (i+1 < argc) { + compLevel = atoi(argv[++i]); + } + else usage(*argv, "-l requires a value from 1-9"); + + if (compLevel < 0 || compLevel > 10) { + usage(*argv, "-l requires a value from 1-9"); + } + } else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str()); } - if (isCommentary) isCommentary = true; // avoid unused warning for now + if (isCommentary) isCommentary = true; // avoid unused warning for now - if (compType == "ZIP") { + if (compType == "LZSS") { + compressor = new LZSSCompress(); + } + else if (compType == "ZIP") { #ifndef EXCLUDEZLIB compressor = new ZipCompress(); #else - usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library"); + usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libz is available when compiling SWORD library"); #endif } - else if (compType == "LZSS") { - compressor = new LZSSCompress(); + else if (compType == "BZIP2") { +#ifndef EXCLUDEBZIP2 + compressor = new Bzip2Compress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with bzip2 compression support.\n\tBe sure libbz2 is available when compiling SWORD library"); +#endif + } + else if (compType == "XZ") { +#ifndef EXCLUDEXZ + compressor = new XzCompress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with xz compression support.\n\tBe sure liblzma is available when compiling SWORD library"); +#endif + } + + if (compressor && compLevel > 0) { + compressor->setLevel(compLevel); } #ifndef _ICU_ @@ -1685,16 +2003,24 @@ int main(int argc, char **argv) { #endif if (debug & DEBUG_OTHER) { - cout << "DEBUG(ARGS):\n\tpath: " << path << "\n\tosisDoc: " << osisDoc << "\n\tcreate: " << append << "\n\tcompressType: " << compType << "\n\tblockType: " << iType << "\n\tcipherKey: " << cipherKey.c_str() << "\n\tnormalize: " << normalize << endl; + cout << "DEBUG(ARGS):\n\tpath: " << path << "\n\tosisDoc: " << osisDoc << "\n\tcreate: " << append << "\n\tcompressType: " << compType << "\n\tblockType: " << iType << "\n\tcompressLevel: " << compLevel << "\n\tcipherKey: " << cipherKey.c_str() << "\n\tnormalize: " << normalize << endl; } - if (!append) { // == 0 then create module + if (!append) { // == 0 then create module // Try to initialize a default set of datafiles and indicies at our // datapath location passed to us from the user. if (compressor) { - if (zText::createModule(path, iType, v11n)) { - fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", program, path); - exit(EXIT_NO_CREATE); + if (entrySize == 4) { + if (zText4::createModule(path, iType, v11n)) { + fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", program, path); + exit(EXIT_NO_CREATE); + } + } + else { + if (zText::createModule(path, iType, v11n)) { + fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", program, path); + exit(EXIT_NO_CREATE); + } } } else if (entrySize == 4) { @@ -1713,50 +2039,69 @@ int main(int argc, char **argv) { // Do some initialization stuff if (compressor) { - // Create a compressed text module allowing very large entries - // Taking defaults except for first, fourth, fifth and last argument - module = new zText( - path, // ipath - 0, // iname - 0, // idesc - iType, // iblockType - compressor, // icomp - 0, // idisp - ENC_UNKNOWN, // enc - DIRECTION_LTR, // dir - FMT_UNKNOWN, // markup - 0, // lang - v11n // versification + if (entrySize == 4) { + // Create a compressed text module allowing very large entries + // Taking defaults except for first, fourth, fifth and last argument + module = new zText4( + path, // ipath + 0, // iname + 0, // idesc + iType, // iblockType + compressor, // icomp + 0, // idisp + ENC_UNKNOWN, // enc + DIRECTION_LTR, // dir + FMT_UNKNOWN, // markup + 0, // lang + v11n // versification + ); + } + else { + // Create a compressed text module allowing reasonable sized entries + // Taking defaults except for first, fourth, fifth and last argument + module = new zText( + path, // ipath + 0, // iname + 0, // idesc + iType, // iblockType + compressor, // icomp + 0, // idisp + ENC_UNKNOWN, // enc + DIRECTION_LTR, // dir + FMT_UNKNOWN, // markup + 0, // lang + v11n // versification ); + } } else if (entrySize == 4) { // Create a raw text module allowing very large entries // Taking defaults except for first and last argument module = new RawText4( - path, // ipath - 0, // iname - 0, // idesc - 0, // idisp - ENC_UNKNOWN, // encoding - DIRECTION_LTR, // dir - FMT_UNKNOWN, // markup - 0, // ilang - v11n // versification + path, // ipath + 0, // iname + 0, // idesc + 0, // idisp + ENC_UNKNOWN, // encoding + DIRECTION_LTR, // dir + FMT_UNKNOWN, // markup + 0, // ilang + v11n // versification ); } else { // Create a raw text module allowing reasonable sized entries // Taking defaults except for first and last argument module = new RawText( - path, // ipath - 0, // iname - 0, // idesc - 0, // idisp - ENC_UNKNOWN, // encoding - DIRECTION_LTR, // dir - FMT_UNKNOWN, // markup - 0, // ilang - v11n // versification + path, // ipath + 0, // iname + 0, // idesc + 0, // idisp + ENC_UNKNOWN, // encoding + DIRECTION_LTR, // dir + FMT_UNKNOWN, // markup + 0, // ilang + v11n // versification ); } @@ -1792,6 +2137,10 @@ int main(int argc, char **argv) { delete module; if (cipherFilter) delete cipherFilter; + if (outputEncoder) + delete outputEncoder; + if (outputDecoder) + delete outputDecoder; fprintf(stderr, "SUCCESS: %s: has finished its work and will now rest\n", program); exit(0); // success diff --git a/utilities/step2vpl.cpp b/utilities/step2vpl.cpp index a9c4a6d..8c3962a 100644 --- a/utilities/step2vpl.cpp +++ b/utilities/step2vpl.cpp @@ -2,7 +2,7 @@ * * step2vpl.cpp - Utility to export a STEP module as VPL * - * $Id: step2vpl.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: step2vpl.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/stepdump.cpp b/utilities/stepdump.cpp index 3b9892e..9cc676f 100644 --- a/utilities/stepdump.cpp +++ b/utilities/stepdump.cpp @@ -2,7 +2,7 @@ * * stepdump.cpp - Utility to dump a STEP module * - * $Id: stepdump.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: stepdump.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/stripaccents.cpp b/utilities/stripaccents.cpp new file mode 100644 index 0000000..338e76b --- /dev/null +++ b/utilities/stripaccents.cpp @@ -0,0 +1,79 @@ +/****************************************************************************** + * + * stripaccents.cpp - This simple utility strips Greek accents, Hebrew vowel + * points and breathing marks and Arab diacritics from a + * given text. + * + * stripaccents + * + * $Id: search.cpp 3269 2014-10-09 14:55:14Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include +#include + +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif + +int usage() +{ + fprintf(stderr, "\nusage: stripaccents \n"); + fprintf(stderr, "\n n=1 \t strip Greek accents"); + fprintf(stderr, "\n n=2 \t strip Arabic vowel points"); + fprintf(stderr, "\n n=4 \t strip Hebrew vowel points"); + fprintf(stderr, "\n n=8 \t strip Hebrew Cantillation marks\n"); + fprintf(stderr, "\n several of the above filters can be engaged by adding the values\n"); + exit(0); +} + +int main(int argc, char **argv) +{ +// SWMgr manager(0, 0, true, new MarkupFilterMgr(FMT_RTF, ENC_RTF)); + SWMgr manager; + + if ((argc < 3) || (argc > 3)) { + usage(); + exit(-1); + } + + int stripFilters = atoi(argv[1]); + + if ((stripFilters < 1) || (stripFilters > 15)) { + usage(); + exit(-1); + } + SWBuf stripTerm = argv[2]; + + manager.setGlobalOption("Greek Accents", "Off"); + manager.setGlobalOption("Arabic Vowel Points", "Off"); + manager.setGlobalOption("Hebrew Vowel Points", "Off"); + manager.setGlobalOption("Hebrew Cantillation", "Off"); + + if (stripFilters & (1 << 0)) manager.filterText("Hebrew Vowel Points", stripTerm); + if (stripFilters & (1 << 1)) manager.filterText("Hebrew Cantillation", stripTerm); + if (stripFilters & (1 << 2)) manager.filterText("Arabic Vowel Points", stripTerm); + if (stripFilters & (1 << 3)) manager.filterText("Greek Accents", stripTerm); + + fprintf(stdout,"%s\n",stripTerm.c_str()); + return 0; + +} diff --git a/utilities/tei2mod.cpp b/utilities/tei2mod.cpp index 575d882..58778f2 100644 --- a/utilities/tei2mod.cpp +++ b/utilities/tei2mod.cpp @@ -2,9 +2,9 @@ * * tei2mod.cpp - Utility to import documents encoded as TEI * - * $Id: tei2mod.cpp 2978 2013-09-10 14:39:31Z scribe $ + * $Id: tei2mod.cpp 3416 2016-03-15 14:07:18Z dmsmith $ * - * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2008-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -62,8 +62,16 @@ #include #include #include -#include #include +#ifndef EXCLUDEZLIB +#include +#endif +#ifndef EXCLUDEBZIP2 +#include +#endif +#ifndef EXCLUDEXZ +#include +#endif #include #include @@ -344,16 +352,16 @@ void usage(const char *app, const char *error = 0) { fprintf(stderr, "TEI Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for\n\tThe SWORD Project\n"); fprintf(stderr, "\nusage: %s [OPTIONS]\n", app); - fprintf(stderr, " -z\t\t\t use ZIP compression (default no compression)\n"); - fprintf(stderr, " -Z\t\t\t use LZSS compression (default no compression)\n"); - fprintf(stderr, " -s <2|4>\t\t max text size per entry(default 4):\n"); + fprintf(stderr, " -z \t\t use compression (default: none)\n"); + fprintf(stderr, "\t\t\t\t l - LZSS; z - ZIP; b - bzip2; x - xz\n"); + fprintf(stderr, " -s <2|4>\t\t max text size per entry (default: 4)\n"); fprintf(stderr, " -c \t encipher module using supplied key\n"); - fprintf(stderr, "\t\t\t\t (default no enciphering)\n"); + fprintf(stderr, "\t\t\t\t (default: none)\n"); fprintf(stderr, " -N\t\t\t Do not convert UTF-8 or normalize UTF-8 to NFC\n"); fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed,\n"); fprintf(stderr, "\t\t\t\t and then normalize to NFC. Note: all UTF-8\n"); fprintf(stderr, "\t\t\t\t texts should be normalized to NFC.)\n"); - fprintf(stderr, "\n\tThe options -z, -Z, and -s are mutually exclusive.\n"); + fprintf(stderr, "\n\tThe options -z and -s are mutually exclusive.\n"); exit(-1); } @@ -364,7 +372,7 @@ int main(int argc, char **argv) { #endif SWBuf program = argv[0]; - fprintf(stderr, "You are running %s: $Rev: 2138 $\n", argv[0]); + fprintf(stderr, "You are running %s: $Rev: 3416 $\n", argv[0]); // Let's test our command line arguments if (argc < 3) { @@ -382,9 +390,16 @@ int main(int argc, char **argv) { for (int i = 3; i < argc; i++) { if (!strcmp(argv[i], "-z")) { - if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); if (modDrv.size()) usage(*argv, "Cannot specify both -z and -s"); compType = "ZIP"; + if (i+1 < argc && argv[i+1][0] != '-') { + switch (argv[++i][0]) { + case 'l': compType = "LZSS"; break; + case 'z': compType = "ZIP"; break; + case 'b': compType = "BZIP2"; break; + case 'x': compType = "XZ"; break; + } + } modDrv = "zLD"; recommendedPath += "zld/"; } @@ -392,10 +407,11 @@ int main(int argc, char **argv) { if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); if (modDrv.size()) usage(*argv, "Cannot specify both -Z and -s"); compType = "LZSS"; + modDrv = "zLD"; recommendedPath += "zld/"; } else if (!strcmp(argv[i], "-s")) { - if (compType.size()) usage(*argv, "Cannot specify both -s and -z or -Z"); + if (compType.size()) usage(*argv, "Cannot specify both -s and -z"); if (i+1 < argc) { int size = atoi(argv[++i]); if (size == 2) { @@ -432,15 +448,29 @@ int main(int argc, char **argv) { } #endif - if (compType == "ZIP") { + if (compType == "LZSS") { + compressor = new LZSSCompress(); + } + else if (compType == "ZIP") { #ifndef EXCLUDEZLIB compressor = new ZipCompress(); #else - usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library"); + usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libz is available when compiling SWORD library"); #endif } - else if (compType == "LZSS") { - compressor = new LZSSCompress(); + else if (compType == "BZIP2") { +#ifndef EXCLUDEBZIP2 + compressor = new Bzip2Compress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with bzip2 compression support.\n\tBe sure libbz2 is available when compiling SWORD library"); +#endif + } + else if (compType == "XZ") { +#ifndef EXCLUDEXZ + compressor = new XzCompress(); +#else + usage(*argv, "ERROR: SWORD library not compiled with xz compression support.\n\tBe sure liblzma is available when compiling SWORD library"); +#endif } #ifdef DEBUG diff --git a/utilities/treeidxutil.cpp b/utilities/treeidxutil.cpp index abb9151..fcd5db7 100644 --- a/utilities/treeidxutil.cpp +++ b/utilities/treeidxutil.cpp @@ -2,7 +2,7 @@ * * treeidxutil.cpp - * - * $Id: treeidxutil.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: treeidxutil.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/vcppmake/addgb.vcxproj b/utilities/vcppmake/addgb.vcxproj index 6f54f23..ffd0cc8 100644 --- a/utilities/vcppmake/addgb.vcxproj +++ b/utilities/vcppmake/addgb.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {76895767-61D0-41E6-B92D-FD541BB26D32} - addgb - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {76895767-61D0-41E6-B92D-FD541BB26D32} + addgb + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/addld.vcxproj b/utilities/vcppmake/addld.vcxproj index f9e614c..fe10bb3 100644 --- a/utilities/vcppmake/addld.vcxproj +++ b/utilities/vcppmake/addld.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} - addld - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} + addld + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/addvs.vcxproj b/utilities/vcppmake/addvs.vcxproj index bef2d4d..7a8df62 100644 --- a/utilities/vcppmake/addvs.vcxproj +++ b/utilities/vcppmake/addvs.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {CFF1021E-B878-481A-851B-2B226701D525} - addvs - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {CFF1021E-B878-481A-851B-2B226701D525} + addvs + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/cipherraw.vcxproj b/utilities/vcppmake/cipherraw.vcxproj index cc9491c..f34f889 100644 --- a/utilities/vcppmake/cipherraw.vcxproj +++ b/utilities/vcppmake/cipherraw.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} - cipherraw - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} + cipherraw + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/emptyvss.vcxproj b/utilities/vcppmake/emptyvss.vcxproj index cb4ee1d..e096f3d 100644 --- a/utilities/vcppmake/emptyvss.vcxproj +++ b/utilities/vcppmake/emptyvss.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {A55BEE98-25BB-463D-9016-14CA4567DFBF} - emptyvss - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {A55BEE98-25BB-463D-9016-14CA4567DFBF} + emptyvss + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/genbookutil.vcxproj b/utilities/vcppmake/genbookutil.vcxproj index 7dac210..458794d 100644 --- a/utilities/vcppmake/genbookutil.vcxproj +++ b/utilities/vcppmake/genbookutil.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} - genbookutil - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} + genbookutil + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/imp2gbs.vcxproj b/utilities/vcppmake/imp2gbs.vcxproj index 1e81347..542e97d 100644 --- a/utilities/vcppmake/imp2gbs.vcxproj +++ b/utilities/vcppmake/imp2gbs.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {2066EC0D-98CC-43E7-8405-5156AF111B38} - imp2gbs - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {2066EC0D-98CC-43E7-8405-5156AF111B38} + imp2gbs + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/imp2ld.vcxproj b/utilities/vcppmake/imp2ld.vcxproj index f186ad6..d42016f 100644 --- a/utilities/vcppmake/imp2ld.vcxproj +++ b/utilities/vcppmake/imp2ld.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} - imp2ld - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} + imp2ld + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/imp2vs.vcxproj b/utilities/vcppmake/imp2vs.vcxproj index d6b1860..eb974c0 100644 --- a/utilities/vcppmake/imp2vs.vcxproj +++ b/utilities/vcppmake/imp2vs.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {5637456D-5B83-4C12-A129-708FC8CF0B33} - imp2vs - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {5637456D-5B83-4C12-A129-708FC8CF0B33} + imp2vs + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/installmgr.vcxproj b/utilities/vcppmake/installmgr.vcxproj index 17d505c..85e2c3e 100644 --- a/utilities/vcppmake/installmgr.vcxproj +++ b/utilities/vcppmake/installmgr.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} - installmgr - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} + installmgr + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/lexdump.vcxproj b/utilities/vcppmake/lexdump.vcxproj index f69e383..a8f42e7 100644 --- a/utilities/vcppmake/lexdump.vcxproj +++ b/utilities/vcppmake/lexdump.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D1115CD8-3810-48B0-8A21-F695016C3557} - lexdump - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {D1115CD8-3810-48B0-8A21-F695016C3557} + lexdump + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mkfastmod.vcxproj b/utilities/vcppmake/mkfastmod.vcxproj index 4095a29..d8b5ab3 100644 --- a/utilities/vcppmake/mkfastmod.vcxproj +++ b/utilities/vcppmake/mkfastmod.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {DB592F77-25DC-4005-BD49-6D0E50303844} - mkfastmod - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - OnlyExplicitInline - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {DB592F77-25DC-4005-BD49-6D0E50303844} + mkfastmod + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + OnlyExplicitInline + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2imp.vcxproj b/utilities/vcppmake/mod2imp.vcxproj index 3c1be95..8b00c00 100644 --- a/utilities/vcppmake/mod2imp.vcxproj +++ b/utilities/vcppmake/mod2imp.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} - mod2imp - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} + mod2imp + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2osis.vcxproj b/utilities/vcppmake/mod2osis.vcxproj index 7227c88..43cf86a 100644 --- a/utilities/vcppmake/mod2osis.vcxproj +++ b/utilities/vcppmake/mod2osis.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {B5D19969-5285-4B0E-B798-496A0B8DCA61} - mod2osis - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {B5D19969-5285-4B0E-B798-496A0B8DCA61} + mod2osis + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2vpl.vcxproj b/utilities/vcppmake/mod2vpl.vcxproj index 8c952a4..6a9eed8 100644 --- a/utilities/vcppmake/mod2vpl.vcxproj +++ b/utilities/vcppmake/mod2vpl.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {0C43604F-08D6-490C-BDFD-1B6CACB59740} - mod2vpl - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {0C43604F-08D6-490C-BDFD-1B6CACB59740} + mod2vpl + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2zmod.vcxproj b/utilities/vcppmake/mod2zmod.vcxproj index 33c6161..549fba6 100644 --- a/utilities/vcppmake/mod2zmod.vcxproj +++ b/utilities/vcppmake/mod2zmod.vcxproj @@ -1,116 +1,116 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} - mod2zmod - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} + mod2zmod + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/modwrite.vcxproj b/utilities/vcppmake/modwrite.vcxproj index 8f36476..4e55c4a 100644 --- a/utilities/vcppmake/modwrite.vcxproj +++ b/utilities/vcppmake/modwrite.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} - modwrite - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} + modwrite + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/osis2mod.vcxproj b/utilities/vcppmake/osis2mod.vcxproj index 28a1178..954e244 100644 --- a/utilities/vcppmake/osis2mod.vcxproj +++ b/utilities/vcppmake/osis2mod.vcxproj @@ -1,123 +1,123 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} - osis2mod - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - AnySuitable - true - Speed - - - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level3 - ProgramDatabase - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - - - - - - - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} + osis2mod + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + AnySuitable + true + Speed + + + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Level3 + ProgramDatabase + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + + + + + + + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/step2vpl.vcxproj b/utilities/vcppmake/step2vpl.vcxproj index 44321ba..b570b6e 100644 --- a/utilities/vcppmake/step2vpl.vcxproj +++ b/utilities/vcppmake/step2vpl.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {43B53430-3C91-4A11-8A1F-5873AEEE0926} - step2vpl - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {43B53430-3C91-4A11-8A1F-5873AEEE0926} + step2vpl + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/stepdump.vcxproj b/utilities/vcppmake/stepdump.vcxproj index 88b05e2..5b61748 100644 --- a/utilities/vcppmake/stepdump.vcxproj +++ b/utilities/vcppmake/stepdump.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} - stepdump - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} + stepdump + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/tei2mod.vcxproj b/utilities/vcppmake/tei2mod.vcxproj index b6784cb..77ab6eb 100644 --- a/utilities/vcppmake/tei2mod.vcxproj +++ b/utilities/vcppmake/tei2mod.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} - tei2mod - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Size - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} + tei2mod + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Size + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/treeidxutil.vcxproj b/utilities/vcppmake/treeidxutil.vcxproj index 2e1026c..a856a1a 100644 --- a/utilities/vcppmake/treeidxutil.vcxproj +++ b/utilities/vcppmake/treeidxutil.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} - treeidxutil - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Size - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} + treeidxutil + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Size + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/utilities.sln b/utilities/vcppmake/utilities.sln index a79f0ae..9085818 100644 --- a/utilities/vcppmake/utilities.sln +++ b/utilities/vcppmake/utilities.sln @@ -1,261 +1,187 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\lib\vcppmake\libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osis2mod", "osis2mod.vcxproj", "{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}" - ProjectSection(ProjectDependencies) = postProject - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} = {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addgb", "addgb.vcxproj", "{76895767-61D0-41E6-B92D-FD541BB26D32}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addld", "addld.vcxproj", "{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}" - ProjectSection(ProjectDependencies) = postProject - {76895767-61D0-41E6-B92D-FD541BB26D32} = {76895767-61D0-41E6-B92D-FD541BB26D32} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addvs", "addvs.vcxproj", "{CFF1021E-B878-481A-851B-2B226701D525}" - ProjectSection(ProjectDependencies) = postProject - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} = {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cipherraw", "cipherraw.vcxproj", "{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}" - ProjectSection(ProjectDependencies) = postProject - {CFF1021E-B878-481A-851B-2B226701D525} = {CFF1021E-B878-481A-851B-2B226701D525} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyvss", "emptyvss.vcxproj", "{A55BEE98-25BB-463D-9016-14CA4567DFBF}" - ProjectSection(ProjectDependencies) = postProject - {891A765C-5503-4FED-B427-7AE1413DB264} = {891A765C-5503-4FED-B427-7AE1413DB264} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2gbs", "imp2gbs.vcxproj", "{2066EC0D-98CC-43E7-8405-5156AF111B38}" - ProjectSection(ProjectDependencies) = postProject - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} = {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2ld", "imp2ld.vcxproj", "{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}" - ProjectSection(ProjectDependencies) = postProject - {2066EC0D-98CC-43E7-8405-5156AF111B38} = {2066EC0D-98CC-43E7-8405-5156AF111B38} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2vs", "imp2vs.vcxproj", "{5637456D-5B83-4C12-A129-708FC8CF0B33}" - ProjectSection(ProjectDependencies) = postProject - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} = {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installmgr", "installmgr.vcxproj", "{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}" - ProjectSection(ProjectDependencies) = postProject - {5637456D-5B83-4C12-A129-708FC8CF0B33} = {5637456D-5B83-4C12-A129-708FC8CF0B33} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkfastmod", "mkfastmod.vcxproj", "{DB592F77-25DC-4005-BD49-6D0E50303844}" - ProjectSection(ProjectDependencies) = postProject - {D1115CD8-3810-48B0-8A21-F695016C3557} = {D1115CD8-3810-48B0-8A21-F695016C3557} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2imp", "mod2imp.vcxproj", "{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}" - ProjectSection(ProjectDependencies) = postProject - {DB592F77-25DC-4005-BD49-6D0E50303844} = {DB592F77-25DC-4005-BD49-6D0E50303844} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2osis", "mod2osis.vcxproj", "{B5D19969-5285-4B0E-B798-496A0B8DCA61}" - ProjectSection(ProjectDependencies) = postProject - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} = {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2vpl", "mod2vpl.vcxproj", "{0C43604F-08D6-490C-BDFD-1B6CACB59740}" - ProjectSection(ProjectDependencies) = postProject - {B5D19969-5285-4B0E-B798-496A0B8DCA61} = {B5D19969-5285-4B0E-B798-496A0B8DCA61} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2zmod", "mod2zmod.vcxproj", "{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}" - ProjectSection(ProjectDependencies) = postProject - {0C43604F-08D6-490C-BDFD-1B6CACB59740} = {0C43604F-08D6-490C-BDFD-1B6CACB59740} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "step2vpl", "step2vpl.vcxproj", "{43B53430-3C91-4A11-8A1F-5873AEEE0926}" - ProjectSection(ProjectDependencies) = postProject - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} = {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stepdump", "stepdump.vcxproj", "{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}" - ProjectSection(ProjectDependencies) = postProject - {43B53430-3C91-4A11-8A1F-5873AEEE0926} = {43B53430-3C91-4A11-8A1F-5873AEEE0926} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tei2mod", "tei2mod.vcxproj", "{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}" - ProjectSection(ProjectDependencies) = postProject - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} = {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treeidxutil", "treeidxutil.vcxproj", "{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}" - ProjectSection(ProjectDependencies) = postProject - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} = {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisref", "vs2osisref.vcxproj", "{DFDB8804-5D6C-448F-A935-DD85629E0554}" - ProjectSection(ProjectDependencies) = postProject - {7192CF83-B08C-4387-A869-FD1970167115} = {7192CF83-B08C-4387-A869-FD1970167115} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisreftxt", "vs2osisreftxt.vcxproj", "{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}" - ProjectSection(ProjectDependencies) = postProject - {DFDB8804-5D6C-448F-A935-DD85629E0554} = {DFDB8804-5D6C-448F-A935-DD85629E0554} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2gbs", "xml2gbs.vcxproj", "{87116D0C-E498-4193-9F2D-301A8771B77D}" - ProjectSection(ProjectDependencies) = postProject - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} = {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genbookutil", "genbookutil.vcxproj", "{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}" - ProjectSection(ProjectDependencies) = postProject - {891A765C-5503-4FED-B427-7AE1413DB264} = {891A765C-5503-4FED-B427-7AE1413DB264} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modwrite", "modwrite.vcxproj", "{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}" - ProjectSection(ProjectDependencies) = postProject - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} = {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpl2mod", "vpl2mod.vcxproj", "{7192CF83-B08C-4387-A869-FD1970167115}" - ProjectSection(ProjectDependencies) = postProject - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} = {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lexdump", "lexdump.vcxproj", "{D1115CD8-3810-48B0-8A21-F695016C3557}" - ProjectSection(ProjectDependencies) = postProject - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} = {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "..\diatheke\diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}" - ProjectSection(ProjectDependencies) = postProject - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} = {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32 - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32 - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32 - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.ActiveCfg = Debug|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.Build.0 = Debug|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.ActiveCfg = Release|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.Build.0 = Release|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.ActiveCfg = Debug|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.Build.0 = Debug|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.ActiveCfg = Release|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.Build.0 = Release|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.Build.0 = Debug|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.ActiveCfg = Release|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.Build.0 = Release|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.ActiveCfg = Debug|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.Build.0 = Debug|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.ActiveCfg = Release|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.Build.0 = Release|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.Build.0 = Debug|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.ActiveCfg = Release|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.Build.0 = Release|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.ActiveCfg = Debug|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.Build.0 = Debug|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.ActiveCfg = Release|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.Build.0 = Release|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.ActiveCfg = Debug|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.Build.0 = Debug|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.ActiveCfg = Release|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.Build.0 = Release|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.ActiveCfg = Debug|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.Build.0 = Debug|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.ActiveCfg = Release|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.Build.0 = Release|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.ActiveCfg = Debug|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.Build.0 = Debug|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.ActiveCfg = Release|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.Build.0 = Release|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.ActiveCfg = Debug|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.Build.0 = Debug|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.ActiveCfg = Release|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.Build.0 = Release|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.ActiveCfg = Debug|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.Build.0 = Debug|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.ActiveCfg = Release|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.Build.0 = Release|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.Build.0 = Debug|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.ActiveCfg = Release|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.Build.0 = Release|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.Build.0 = Debug|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.ActiveCfg = Release|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.Build.0 = Release|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.Build.0 = Debug|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.ActiveCfg = Release|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.Build.0 = Release|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.ActiveCfg = Debug|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.Build.0 = Debug|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.ActiveCfg = Release|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.Build.0 = Release|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.ActiveCfg = Debug|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.Build.0 = Debug|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.ActiveCfg = Release|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.Build.0 = Release|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.ActiveCfg = Debug|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.Build.0 = Debug|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.ActiveCfg = Release|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.Build.0 = Release|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.Build.0 = Debug|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.ActiveCfg = Release|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.Build.0 = Release|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.Build.0 = Debug|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.ActiveCfg = Release|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.Build.0 = Release|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.ActiveCfg = Debug|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.Build.0 = Debug|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.ActiveCfg = Release|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.Build.0 = Release|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.Build.0 = Debug|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.ActiveCfg = Release|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.Build.0 = Release|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.ActiveCfg = Debug|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.Build.0 = Debug|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.ActiveCfg = Release|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.Build.0 = Release|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.Build.0 = Debug|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.ActiveCfg = Release|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.Build.0 = Release|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.ActiveCfg = Debug|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.Build.0 = Debug|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.ActiveCfg = Release|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.Build.0 = Release|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.ActiveCfg = Debug|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.Build.0 = Debug|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.ActiveCfg = Release|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.Build.0 = Release|Win32 - {D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.ActiveCfg = Debug|Win32 - {D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.Build.0 = Debug|Win32 - {D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.ActiveCfg = Release|Win32 - {D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.Build.0 = Release|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32 - {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\lib\vcppmake\libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osis2mod", "osis2mod.vcxproj", "{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addgb", "addgb.vcxproj", "{76895767-61D0-41E6-B92D-FD541BB26D32}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addld", "addld.vcxproj", "{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addvs", "addvs.vcxproj", "{CFF1021E-B878-481A-851B-2B226701D525}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cipherraw", "cipherraw.vcxproj", "{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyvss", "emptyvss.vcxproj", "{A55BEE98-25BB-463D-9016-14CA4567DFBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2gbs", "imp2gbs.vcxproj", "{2066EC0D-98CC-43E7-8405-5156AF111B38}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2ld", "imp2ld.vcxproj", "{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2vs", "imp2vs.vcxproj", "{5637456D-5B83-4C12-A129-708FC8CF0B33}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installmgr", "installmgr.vcxproj", "{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkfastmod", "mkfastmod.vcxproj", "{DB592F77-25DC-4005-BD49-6D0E50303844}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2imp", "mod2imp.vcxproj", "{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2osis", "mod2osis.vcxproj", "{B5D19969-5285-4B0E-B798-496A0B8DCA61}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2vpl", "mod2vpl.vcxproj", "{0C43604F-08D6-490C-BDFD-1B6CACB59740}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2zmod", "mod2zmod.vcxproj", "{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "step2vpl", "step2vpl.vcxproj", "{43B53430-3C91-4A11-8A1F-5873AEEE0926}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stepdump", "stepdump.vcxproj", "{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tei2mod", "tei2mod.vcxproj", "{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treeidxutil", "treeidxutil.vcxproj", "{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisref", "vs2osisref.vcxproj", "{DFDB8804-5D6C-448F-A935-DD85629E0554}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisreftxt", "vs2osisreftxt.vcxproj", "{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2gbs", "xml2gbs.vcxproj", "{87116D0C-E498-4193-9F2D-301A8771B77D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genbookutil", "genbookutil.vcxproj", "{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modwrite", "modwrite.vcxproj", "{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpl2mod", "vpl2mod.vcxproj", "{7192CF83-B08C-4387-A869-FD1970167115}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lexdump", "lexdump.vcxproj", "{D1115CD8-3810-48B0-8A21-F695016C3557}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "..\diatheke\diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}" + ProjectSection(ProjectDependencies) = postProject + {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.Build.0 = Debug|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.ActiveCfg = Release|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.Build.0 = Release|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.ActiveCfg = Debug|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.Build.0 = Debug|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.ActiveCfg = Release|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.Build.0 = Release|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.Build.0 = Debug|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.ActiveCfg = Release|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.Build.0 = Release|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.ActiveCfg = Debug|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.Build.0 = Debug|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.ActiveCfg = Release|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.Build.0 = Release|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.Build.0 = Debug|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.ActiveCfg = Release|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.Build.0 = Release|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.Build.0 = Debug|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.ActiveCfg = Release|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.Build.0 = Release|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.ActiveCfg = Debug|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.Build.0 = Debug|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.ActiveCfg = Release|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.Build.0 = Release|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.Build.0 = Debug|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.ActiveCfg = Release|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.Build.0 = Release|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.ActiveCfg = Debug|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.Build.0 = Debug|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.ActiveCfg = Release|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.Build.0 = Release|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.Build.0 = Debug|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.ActiveCfg = Release|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.Build.0 = Release|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.ActiveCfg = Debug|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.Build.0 = Debug|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.ActiveCfg = Release|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.Build.0 = Release|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.Build.0 = Debug|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.ActiveCfg = Release|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.Build.0 = Release|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.ActiveCfg = Debug|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.Build.0 = Debug|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.ActiveCfg = Release|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.Build.0 = Release|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.Build.0 = Debug|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.ActiveCfg = Release|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.Build.0 = Release|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.ActiveCfg = Debug|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.Build.0 = Debug|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.ActiveCfg = Release|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.Build.0 = Release|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.ActiveCfg = Debug|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.Build.0 = Debug|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.ActiveCfg = Release|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.Build.0 = Release|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.Build.0 = Debug|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.ActiveCfg = Release|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.Build.0 = Release|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.Build.0 = Debug|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.ActiveCfg = Release|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.Build.0 = Release|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.Build.0 = Debug|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.ActiveCfg = Release|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.Build.0 = Release|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.ActiveCfg = Debug|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.Build.0 = Debug|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.ActiveCfg = Release|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.Build.0 = Release|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.Build.0 = Debug|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.ActiveCfg = Release|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.Build.0 = Release|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.ActiveCfg = Debug|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.Build.0 = Debug|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.ActiveCfg = Release|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.Build.0 = Release|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.Build.0 = Debug|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.ActiveCfg = Release|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.Build.0 = Release|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.ActiveCfg = Debug|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.Build.0 = Debug|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.ActiveCfg = Release|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.Build.0 = Release|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.ActiveCfg = Debug|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.Build.0 = Debug|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.ActiveCfg = Release|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.Build.0 = Release|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.Build.0 = Debug|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.ActiveCfg = Release|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.Build.0 = Release|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/utilities/vcppmake/vpl2mod.vcxproj b/utilities/vcppmake/vpl2mod.vcxproj index cd59a72..3382242 100644 --- a/utilities/vcppmake/vpl2mod.vcxproj +++ b/utilities/vcppmake/vpl2mod.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7192CF83-B08C-4387-A869-FD1970167115} - vpl2mod - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {7192CF83-B08C-4387-A869-FD1970167115} + vpl2mod + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/vs2osisref.vcxproj b/utilities/vcppmake/vs2osisref.vcxproj index 837e68b..fff0328 100644 --- a/utilities/vcppmake/vs2osisref.vcxproj +++ b/utilities/vcppmake/vs2osisref.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {DFDB8804-5D6C-448F-A935-DD85629E0554} - vs2osisref - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {DFDB8804-5D6C-448F-A935-DD85629E0554} + vs2osisref + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/vs2osisreftxt.vcxproj b/utilities/vcppmake/vs2osisreftxt.vcxproj index d5d1a18..9ce8746 100644 --- a/utilities/vcppmake/vs2osisreftxt.vcxproj +++ b/utilities/vcppmake/vs2osisreftxt.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} - vs2osisreftxt - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Size - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} + vs2osisreftxt + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Size + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/xml2gbs.vcxproj b/utilities/vcppmake/xml2gbs.vcxproj index c53459a..38e0815 100644 --- a/utilities/vcppmake/xml2gbs.vcxproj +++ b/utilities/vcppmake/xml2gbs.vcxproj @@ -1,117 +1,117 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {87116D0C-E498-4193-9F2D-301A8771B77D} - xml2gbs - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)Debug\ - Debug\ - $(SolutionDir)Release\ - Release\ - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - true - - - - Disabled - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - true - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Debug\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - - - Full - true - ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - AnySuitable - Speed - - - libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) - Release\$(ProjectName).exe - ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - - - - {97449e5e-f880-4d22-933a-0d2fc32034d4} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {87116D0C-E498-4193-9F2D-301A8771B77D} + xml2gbs + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + $(SolutionDir)Debug\$(ProjectName)\ + $(SolutionDir)Release\ + $(SolutionDir)Release\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + \ No newline at end of file diff --git a/utilities/vpl2mod.cpp b/utilities/vpl2mod.cpp index c696541..c4b61b0 100644 --- a/utilities/vpl2mod.cpp +++ b/utilities/vpl2mod.cpp @@ -2,7 +2,7 @@ * * vpl2mod.cpp - Utility to import VPL formatted modules * - * $Id: vpl2mod.cpp 2921 2013-07-28 17:21:44Z scribe $ + * $Id: vpl2mod.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/vs2osisref.cpp b/utilities/vs2osisref.cpp index d283944..ec4b80b 100644 --- a/utilities/vs2osisref.cpp +++ b/utilities/vs2osisref.cpp @@ -2,7 +2,7 @@ * * vs2osisref.cpp - Utility to translate a verse reference to an osisRef * - * $Id: vs2osisref.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: vs2osisref.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/vs2osisreftxt.cpp b/utilities/vs2osisreftxt.cpp index cd52789..0434294 100644 --- a/utilities/vs2osisreftxt.cpp +++ b/utilities/vs2osisreftxt.cpp @@ -3,7 +3,7 @@ * vs2osisreftext.cpp - Utility to translate a verse reference to an * osisRef * - * $Id: vs2osisreftxt.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: vs2osisreftxt.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/utilities/xml2gbs.cpp b/utilities/xml2gbs.cpp index d49b536..354771b 100644 --- a/utilities/xml2gbs.cpp +++ b/utilities/xml2gbs.cpp @@ -2,7 +2,7 @@ * * xml2gbs.cpp - Importer for GenBooks formatted as OSIS, ThML, or TEI * - * $Id: xml2gbs.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: xml2gbs.cpp 3063 2014-03-04 13:04:11Z chrislit $ * * Copyright 2003-2012 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society -- cgit v1.2.3